From 3b93392ae6dd3e2fa8c27d2f3273e4b20629a7eb Mon Sep 17 00:00:00 2001
From: Alexandre MERLIN <alexandre.merlin@inria.fr>
Date: Wed, 7 Jul 2021 16:27:41 +0200
Subject: [PATCH] [input] move id key for storage

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

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 4d33f00b75e..1898fce40a8 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-1.yaml
@@ -76,26 +76,26 @@ dahu-1:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010aad7"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107af8"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bfd50"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 02619c6fc1d..873aea8caa8 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-10.yaml
@@ -76,26 +76,26 @@ dahu-10:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a9a6"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b09"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59eee40"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 72c220ab8a2..e5f3c4ce39e 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-11.yaml
@@ -76,26 +76,26 @@ dahu-11:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a99c"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b18"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c5a06"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 adec85bc265..2b61e2cf20a 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-12.yaml
@@ -76,26 +76,26 @@ dahu-12:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a9b7"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b16"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59f5333"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 97d26b6f36a..5c4eaf0deeb 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-13.yaml
@@ -76,26 +76,26 @@ dahu-13:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010aadc"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00108c2b"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bee44"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 624497bc65c..cc128d98089 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-14.yaml
@@ -76,26 +76,26 @@ dahu-14:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010aade"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b54"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c855e"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 cdcc5dbbbfe..b5804c8af96 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-15.yaml
@@ -76,26 +76,26 @@ dahu-15:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010aae0"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c408c212f"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bfe44"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 1f60298424d..116ba259b37 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-16.yaml
@@ -76,26 +76,26 @@ dahu-16:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010aadf"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107f0a"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59be813"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 33d67562f34..7352a262e2e 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-17.yaml
@@ -76,26 +76,26 @@ dahu-17:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a94d"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107ade"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59f2445"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 477051bb208..bd3bc98cc97 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-18.yaml
@@ -76,26 +76,26 @@ dahu-18:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a966"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107aee"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59f6e03"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 aff44e3a4c9..cfa2ccbd29a 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-19.yaml
@@ -76,26 +76,26 @@ dahu-19:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a958"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107adf"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59b9b2a"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 203691f4d45..2cf94d519f9 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-2.yaml
@@ -76,26 +76,26 @@ dahu-2:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010aad8"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b06"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bf16d"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 7cdc228a1ab..05392d25c50 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-20.yaml
@@ -76,26 +76,26 @@ dahu-20:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a918"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107ae1"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c6300"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 4aff0a2c7fa..39646637025 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-21.yaml
@@ -76,26 +76,26 @@ dahu-21:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a894"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107aed"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c85a2"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 879b1ec523f..bd235bdb8f8 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-22.yaml
@@ -76,26 +76,26 @@ dahu-22:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a824"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107af7"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bdfbc"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 d74403be952..0daee67c025 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-23.yaml
@@ -76,26 +76,26 @@ dahu-23:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a96e"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b05"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59be5d0"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 fa67ba70f58..06b342b5c69 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-24.yaml
@@ -76,26 +76,26 @@ dahu-24:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a82d"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107aef"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59ba245"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 cda4b55174f..ec086ed7656 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-25.yaml
@@ -76,26 +76,26 @@ dahu-25:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a9ac"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107ad7"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a5a171a0"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 ec672fc6bdb..56e2f7953f0 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-26.yaml
@@ -76,26 +76,26 @@ dahu-26:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a9ad"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b26"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59ed6c7"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 e56fa490323..0ac1462ade1 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-27.yaml
@@ -76,26 +76,26 @@ dahu-27:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a980"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b23"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59f1bfa"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 77708620039..d6e410b435b 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-28.yaml
@@ -76,26 +76,26 @@ dahu-28:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c406e9a4a"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00108792"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59baaab"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 042ac6c9b8b..ac6f4b8259b 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-29.yaml
@@ -76,26 +76,26 @@ dahu-29:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a98f"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00108bef"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bb3fc"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 6cb3f457868..876cdbfd33b 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-3.yaml
@@ -76,26 +76,26 @@ dahu-3:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010aae1"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107af9"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bd027"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 2f2d1690040..29f1abc60a5 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-30.yaml
@@ -76,26 +76,26 @@ dahu-30:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a97a"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00108bf0"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a5a1b937"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 ae68da9cc57..01018d4f7cf 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-31.yaml
@@ -76,26 +76,26 @@ dahu-31:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a991"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00108bdd"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c90ac"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 c29958e619e..78c0458efb1 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-32.yaml
@@ -76,26 +76,26 @@ dahu-32:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a988"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00108bf1"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bea5a"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 e377145b830..a0ff2c30937 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-4.yaml
@@ -76,26 +76,26 @@ dahu-4:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010aad9"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107b07"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c1fa4"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 537fa1a0924..6925de1e424 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-5.yaml
@@ -76,26 +76,26 @@ dahu-5:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a8d9"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107ad4"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c0047"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 8205d18210c..29f02db1e89 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-6.yaml
@@ -76,26 +76,26 @@ dahu-6:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a89a"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107ac4"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59bfa82"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 b55c872e9b3..90b23834f9a 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-7.yaml
@@ -76,26 +76,26 @@ dahu-7:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a8a5"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107ab8"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a5a16fb1"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB32
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 a088e7fe256..6ecb574a8ae 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-8.yaml
@@ -76,26 +76,26 @@ dahu-8:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a8e3"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107ac7"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59be557"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       storage: HDD
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 9faa1fb3e53..cecf5015919 100644
--- a/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.yaml
+++ b/input/grid5000/sites/grenoble/clusters/dahu/nodes/dahu-9.yaml
@@ -76,26 +76,26 @@ dahu-9:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c0010a4a0"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: GD57
+      id: disk0
       model: MZ7KM240HMHQ0D3
       size: 240057409536
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5002538c00107cba"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-4"
       firmware_version: GD57
+      id: disk1
       model: MZ7KM480HMHQ0D3
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c500a59c79a6"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-5"
       firmware_version: DB34
+      id: disk2
       model: ST4000NM0265-2DC
       size: 4000787030016
       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 b686b99819c..765b6ff0379 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-1.yaml
@@ -156,18 +156,18 @@ drac-1:
     version: 1.0
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c0fa4a5"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-1"
       firmware_version: BE33
+      id: disk0
       model: ST1000NX0313
       size: 1000204886016
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c18078e"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
+      id: disk1
       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 fe809b61220..86ddd32d7c4 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-10.yaml
@@ -156,18 +156,18 @@ drac-10:
     version: 1.0
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c182ff3"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-1"
       firmware_version: BE33
+      id: disk0
       model: ST1000NX0313
       size: 1000204886016
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50081027356"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
+      id: disk1
       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 2d816e20858..0d7b8b9b0c9 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-11.yaml
@@ -156,18 +156,18 @@ drac-11:
     version: 1.0
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c1828f7"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-1"
       firmware_version: BE33
+      id: disk0
       model: ST1000NX0313
       size: 1000204886016
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50081106cbd"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
+      id: disk1
       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 e946f15ec23..3dac6aa43b5 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-12.yaml
@@ -156,18 +156,18 @@ drac-12:
     version: 1.0
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c181b15"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-1"
       firmware_version: BE33
+      id: disk0
       model: ST1000NX0313
       size: 1000204886016
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50081106db5"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
+      id: disk1
       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 81cce7370d0..75f50885ea2 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-2.yaml
@@ -156,18 +156,18 @@ drac-2:
     version: 1.0
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500811069a0"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-1"
       firmware_version: BE33
+      id: disk0
       model: ST1000NX0313
       size: 1000204886016
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50081107893"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
+      id: disk1
       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 17999696160..a588c19d19d 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-3.yaml
@@ -156,18 +156,18 @@ drac-3:
     version: 1.0
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c1827b8"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-1"
       firmware_version: BE33
+      id: disk0
       model: ST1000NX0313
       size: 1000204886016
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c5a66ac"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
+      id: disk1
       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 84bc65f4ecb..305d90bf405 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-4.yaml
@@ -156,18 +156,18 @@ drac-4:
     version: 1.0
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008110859b"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-1"
       firmware_version: BE33
+      id: disk0
       model: ST1000NX0313
       size: 1000204886016
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50081026d3e"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
+      id: disk1
       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 d49745911a2..cb84f705648 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-5.yaml
@@ -156,18 +156,18 @@ drac-5:
     version: 1.0
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50081108684"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-1"
       firmware_version: BE33
+      id: disk0
       model: ST1000NX0313
       size: 1000204886016
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c5cb8a9"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
+      id: disk1
       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 05a701eac83..ad38f6176a3 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-6.yaml
@@ -156,18 +156,18 @@ drac-6:
     version: 1.0
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c469404"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-1"
       firmware_version: BE33
+      id: disk0
       model: ST1000NX0313
       size: 1000204886016
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50081108685"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
+      id: disk1
       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 f261d078877..6865e814c40 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-7.yaml
@@ -156,18 +156,18 @@ drac-7:
     version: 1.0
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c5cc061"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-1"
       firmware_version: BE33
+      id: disk0
       model: ST1000NX0313
       size: 1000204886016
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008111f2af"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
+      id: disk1
       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 2e25630cd6f..8219cc2f067 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-8.yaml
@@ -156,18 +156,18 @@ drac-8:
     version: 1.0
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50080dc50c9"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-1"
       firmware_version: BE32
+      id: disk0
       model: ST1000NX0313
       size: 1000204886016
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008110789b"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
+      id: disk1
       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 a01abbc11ba..1c52ed4b097 100644
--- a/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.yaml
+++ b/input/grid5000/sites/grenoble/clusters/drac/nodes/drac-9.yaml
@@ -156,18 +156,18 @@ drac-9:
     version: 1.0
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c182b32"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-1"
       firmware_version: BE33
+      id: disk0
       model: ST1000NX0313
       size: 1000204886016
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008c5ab80c"
       by_path: "/dev/disk/by-path/pci-0009:04:00.0-ata-2"
       firmware_version: BE33
+      id: disk1
       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 ce38b2cda02..1dad4ac7315 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-1.yaml
@@ -77,17 +77,17 @@ troll-1:
     version: Gold 5218
   storage_devices:
     nvme0n1:
-      id: "disk1"
       by_id: "/dev/disk/by-id/nvme-eui.36314130522024320025384100000004"
       by_path: "/dev/disk/by-path/pci-0000:d8:00.0-nvme-1"
+      id: disk1
       model: Dell Ent NVMe AGN MU AIC 1.6TB
       size: 1600321314816
       storage: SSD
     sda:
-      id: "disk0"
       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
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
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 0296a07e9cb..fa2ec5b4adb 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-2.yaml
@@ -77,17 +77,17 @@ troll-2:
     version: Gold 5218
   storage_devices:
     nvme0n1:
-      id: "disk1"
       by_id: "/dev/disk/by-id/nvme-eui.36314130522024170025384100000004"
       by_path: "/dev/disk/by-path/pci-0000:d8:00.0-nvme-1"
+      id: disk1
       model: Dell Ent NVMe AGN MU AIC 1.6TB
       size: 1600321314816
       storage: SSD
     sda:
-      id: "disk0"
       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
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
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 bb2263c7b95..417ac01db58 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-3.yaml
@@ -77,17 +77,17 @@ troll-3:
     version: Gold 5218
   storage_devices:
     nvme0n1:
-      id: "disk1"
       by_id: "/dev/disk/by-id/nvme-eui.36314130522024410025384100000004"
       by_path: "/dev/disk/by-path/pci-0000:d8:00.0-nvme-1"
+      id: disk1
       model: Dell Ent NVMe AGN MU AIC 1.6TB
       size: 1600321314816
       storage: SSD
     sda:
-      id: "disk0"
       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
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
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 975bd7971d9..0febf2f4953 100644
--- a/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/troll/nodes/troll-4.yaml
@@ -77,17 +77,17 @@ troll-4:
     version: Gold 5218
   storage_devices:
     nvme0n1:
-      id: "disk1"
       by_id: "/dev/disk/by-id/nvme-eui.36314130522023450025384100000004"
       by_path: "/dev/disk/by-path/pci-0000:d8:00.0-nvme-1"
+      id: disk1
       model: Dell Ent NVMe AGN MU AIC 1.6TB
       size: 1600321314816
       storage: SSD
     sda:
-      id: "disk0"
       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
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
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 1eb9ac68765..edc09e77308 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-1.yaml
@@ -94,48 +94,48 @@ yeti-1:
     version: Gold 6130
   storage_devices:
     nvme0n1:
-      id: "disk4"
       by_id: "/dev/disk/by-id/nvme-eui.0025389671000bad"
       by_path: "/dev/disk/by-path/pci-0000:59:00.0-nvme-1"
+      id: disk4
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
       storage: SSD
     nvme1n1:
-      id: "disk5"
       by_id: "/dev/disk/by-id/nvme-eui.0025389671000bb3"
       by_path: "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1"
+      id: disk5
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
       storage: SSD
     sda:
-      id: "disk0"
       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
+      id: disk0
       model: SSDSC2KG480G7R
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: ST2000NX0463
       size: 2000398934016
       storage: HDD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: ST2000NX0463
       size: 2000398934016
       storage: HDD
     sdd:
-      id: "disk3"
       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
+      id: disk3
       model: ST2000NX0463
       size: 2000398934016
       storage: HDD
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 6482d092436..a5bcbbdcef1 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-2.yaml
@@ -94,48 +94,48 @@ yeti-2:
     version: Gold 6130
   storage_devices:
     nvme0n1:
-      id: "disk4"
       by_id: "/dev/disk/by-id/nvme-eui.0025389671000baf"
       by_path: "/dev/disk/by-path/pci-0000:59:00.0-nvme-1"
+      id: disk4
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
       storage: SSD
     nvme1n1:
-      id: "disk5"
       by_id: "/dev/disk/by-id/nvme-eui.0025389571001020"
       by_path: "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1"
+      id: disk5
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
       storage: SSD
     sda:
-      id: "disk0"
       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
+      id: disk0
       model: SSDSC2KG480G7R
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: ST2000NX0463
       size: 2000398934016
       storage: HDD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: ST2000NX0463
       size: 2000398934016
       storage: HDD
     sdd:
-      id: "disk3"
       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
+      id: disk3
       model: ST2000NX0463
       size: 2000398934016
       storage: HDD
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 760d3284c7a..859eb3f6bef 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-3.yaml
@@ -94,48 +94,48 @@ yeti-3:
     version: Gold 6130
   storage_devices:
     nvme0n1:
-      id: "disk4"
       by_id: "/dev/disk/by-id/nvme-eui.0025389671000bb6"
       by_path: "/dev/disk/by-path/pci-0000:59:00.0-nvme-1"
+      id: disk4
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
       storage: SSD
     nvme1n1:
-      id: "disk5"
       by_id: "/dev/disk/by-id/nvme-eui.002538957100101f"
       by_path: "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1"
+      id: disk5
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
       storage: SSD
     sda:
-      id: "disk0"
       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
+      id: disk0
       model: SSDSC2KG480G8R
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: ST2000NX0463
       size: 2000398934016
       storage: HDD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: ST2000NX0463
       size: 2000398934016
       storage: HDD
     sdd:
-      id: "disk3"
       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
+      id: disk3
       model: ST2000NX0463
       size: 2000398934016
       storage: HDD
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 8530c502294..842fff3ac97 100644
--- a/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
+++ b/input/grid5000/sites/grenoble/clusters/yeti/nodes/yeti-4.yaml
@@ -94,48 +94,48 @@ yeti-4:
     version: Gold 6130
   storage_devices:
     nvme0n1:
-      id: "disk4"
       by_id: "/dev/disk/by-id/nvme-eui.002538957100101b"
       by_path: "/dev/disk/by-path/pci-0000:59:00.0-nvme-1"
+      id: disk4
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
       storage: SSD
     nvme1n1:
-      id: "disk5"
       by_id: "/dev/disk/by-id/nvme-eui.0025389671000bb5"
       by_path: "/dev/disk/by-path/pci-0000:6d:00.0-nvme-1"
+      id: disk5
       model: Dell Express Flash NVMe PM1725 1.6TB AIC
       size: 1600321314816
       storage: SSD
     sda:
-      id: "disk0"
       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
+      id: disk0
       model: SSDSC2KG480G7R
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: ST2000NX0463
       size: 2000398934016
       storage: HDD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: ST2000NX0463
       size: 2000398934016
       storage: HDD
     sdd:
-      id: "disk3"
       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
+      id: disk3
       model: ST2000NX0463
       size: 2000398934016
       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 d29869a5163..60b7dad50b6 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-1.yaml
@@ -83,18 +83,18 @@ chetemi-1:
     version: E5-2630 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c0d57"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: VT33
+      id: disk0
       model: ST300MP0005
       size: 300000000000
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c06c7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 136ee5c9dbd..be51c532649 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-10.yaml
@@ -83,18 +83,18 @@ chetemi-10:
     version: E5-2630 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b82062b7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: KT37
+      id: disk0
       model: ST600MP0036
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982be5d7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 06dc85572b7..519d7f1e0ee 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-11.yaml
@@ -83,18 +83,18 @@ chetemi-11:
     version: E5-2630 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c34cb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: VT33
+      id: disk0
       model: ST300MP0005
       size: 300000000000
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c29ef"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 f9eedde050d..805bd67815c 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-12.yaml
@@ -83,18 +83,18 @@ chetemi-12:
     version: E5-2630 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bddd7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: VT33
+      id: disk0
       model: ST300MP0005
       size: 300000000000
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982be0d3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 84ce0b45efe..6cb0bf7d188 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-13.yaml
@@ -83,18 +83,18 @@ chetemi-13:
     version: E5-2630 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c2d9b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: VT33
+      id: disk0
       model: ST300MP0005
       size: 300000000000
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bdf6f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 1afab0aefe0..c74192e285d 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-14.yaml
@@ -83,18 +83,18 @@ chetemi-14:
     version: E5-2630 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bcd6f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: VT33
+      id: disk0
       model: ST300MP0005
       size: 300000000000
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bacaf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 6a27f20db59..0d96e19baeb 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-15.yaml
@@ -83,18 +83,18 @@ chetemi-15:
     version: E5-2630 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982ba8e7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: VT33
+      id: disk0
       model: ST300MP0005
       size: 300000000000
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bc92b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 acee8ee1368..0a0ccf7795c 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-2.yaml
@@ -83,18 +83,18 @@ chetemi-2:
     version: E5-2630 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bb667"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: VT33
+      id: disk0
       model: ST300MP0005
       size: 300000000000
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c11d3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 88a31c67887..a2da7b9feff 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-3.yaml
@@ -83,18 +83,18 @@ chetemi-3:
     version: E5-2630 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bfd7f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: VT33
+      id: disk0
       model: ST300MP0005
       size: 300000000000
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c2b5f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 a0c04daae60..172136e497f 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-4.yaml
@@ -83,18 +83,18 @@ chetemi-4:
     version: E5-2630 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982be717"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: VT33
+      id: disk0
       model: ST300MP0005
       size: 300000000000
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c1723"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 6cf583951a7..fddf80fd614 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-5.yaml
@@ -83,18 +83,18 @@ chetemi-5:
     version: E5-2630 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c226b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: VT33
+      id: disk0
       model: ST300MP0005
       size: 300000000000
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bdb03"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 1024f1e422d..c8ca8a1e70e 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-6.yaml
@@ -83,18 +83,18 @@ chetemi-6:
     version: E5-2630 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bcfff"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: VT33
+      id: disk0
       model: ST300MP0005
       size: 300000000000
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bf523"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 5dee02fb78e..6dc5cf4048f 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-7.yaml
@@ -83,18 +83,18 @@ chetemi-7:
     version: E5-2630 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982bdacf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: VT33
+      id: disk0
       model: ST300MP0005
       size: 300000000000
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c34ff"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 d097932110a..0e3d45ec79f 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-8.yaml
@@ -83,18 +83,18 @@ chetemi-8:
     version: E5-2630 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c043b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: VT33
+      id: disk0
       model: ST300MP0005
       size: 300000000000
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c310b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 b44f69ccb9f..351af5b07cf 100644
--- a/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml
+++ b/input/grid5000/sites/lille/clusters/chetemi/nodes/chetemi-9.yaml
@@ -83,18 +83,18 @@ chetemi-9:
     version: E5-2630 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c0de7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: VT33
+      id: disk0
       model: ST300MP0005
       size: 300000000000
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c500982c1dbf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: VT33
+      id: disk1
       model: ST300MP0005
       size: 300000000000
       storage: HDD
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 2e1932f16c3..c602e8f326e 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-1.yaml
@@ -101,26 +101,26 @@ chiclet-1:
     version: 7301
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x58ce38ee2035dde9"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:0:0"
       firmware_version: AS0E
+      id: disk0
       model: PX05SVB048Y
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
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 ea0c4bea0bd..1132c292ce7 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-2.yaml
@@ -101,26 +101,26 @@ chiclet-2:
     version: 7301
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x58ce38ee2035d47d"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:0:0"
       firmware_version: AS0E
+      id: disk0
       model: PX05SVB048Y
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
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 564479ce204..ac27f8c4428 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-3.yaml
@@ -101,26 +101,26 @@ chiclet-3:
     version: 7301
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x58ce38ee2035d489"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:0:0"
       firmware_version: AS0E
+      id: disk0
       model: PX05SVB048Y
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
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 031c0e37e5b..f2d48b7d8e8 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-4.yaml
@@ -101,26 +101,26 @@ chiclet-4:
     version: 7301
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x58ce38ee2035dded"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:0:0"
       firmware_version: AS0E
+      id: disk0
       model: PX05SVB048Y
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
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 c4b812c94fd..30a1124dcd3 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-5.yaml
@@ -101,26 +101,26 @@ chiclet-5:
     version: 7301
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x58ce38ee2035d491"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:0:0"
       firmware_version: AS0E
+      id: disk0
       model: PX05SVB048Y
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
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 e40151d9643..40b51599be8 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-6.yaml
@@ -101,26 +101,26 @@ chiclet-6:
     version: 7301
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x58ce38ee2035d435"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:0:0"
       firmware_version: AS0E
+      id: disk0
       model: PX05SVB048Y
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
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 818f503b978..983d00cd070 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-7.yaml
@@ -101,26 +101,26 @@ chiclet-7:
     version: 7301
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x58ce38ee2035d479"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:0:0"
       firmware_version: AS0E
+      id: disk0
       model: PX05SVB048Y
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
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 39c68b99614..aeec52a29cb 100644
--- a/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chiclet/nodes/chiclet-8.yaml
@@ -101,26 +101,26 @@ chiclet-8:
     version: 7301
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x58ce38ee2035d42d"
       by_path: "/dev/disk/by-path/pci-0000:61:00.0-scsi-0:0:0:0"
       firmware_version: AS0E
+      id: disk0
       model: PX05SVB048Y
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
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 a9ac7dc76a9..ac29f98c934 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml
@@ -100,34 +100,34 @@ chifflet-1:
     version: E5-2680 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a8d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a68a5"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: AM07
+      id: disk1
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x500003973be828e7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
+      id: disk2
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x500003973b80345a"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
+      id: disk3
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
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 9b94723d906..f11d5ff11fe 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml
@@ -100,34 +100,34 @@ chifflet-2:
     version: E5-2680 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a75"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1ad9"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: AM07
+      id: disk1
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x500003973be828eb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
+      id: disk2
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x500003973be828e9"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
+      id: disk3
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
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 f587342fead..d3d65bc7197 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml
@@ -100,34 +100,34 @@ chifflet-3:
     version: E5-2680 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1ab5"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a99"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: AM07
+      id: disk1
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x500003973bf03b57"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
+      id: disk2
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x500003973bf03b54"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
+      id: disk3
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
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 02e84efc952..13879d53a0d 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml
@@ -100,34 +100,34 @@ chifflet-4:
     version: E5-2680 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a68ad"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1ac9"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: AM07
+      id: disk1
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x500003973be828f2"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
+      id: disk2
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x500003973be828e6"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
+      id: disk3
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
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 439a21ddaeb..4c743f80061 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-5.yaml
@@ -100,34 +100,34 @@ chifflet-5:
     version: E5-2680 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1ac1"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a81"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: AM07
+      id: disk1
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x500003973be828ea"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
+      id: disk2
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x500003973be828ee"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
+      id: disk3
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
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 ef8b5bdead5..eb34ea4aa1b 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-6.yaml
@@ -100,34 +100,34 @@ chifflet-6:
     version: E5-2680 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a79"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1ac5"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: AM07
+      id: disk1
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x500003973bf03b56"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
+      id: disk2
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x500003973bf03b58"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
+      id: disk3
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
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 d968119477b..5546659c2d3 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-7.yaml
@@ -100,34 +100,34 @@ chifflet-7:
     version: E5-2680 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a6891"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a85"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: AM07
+      id: disk1
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x500003973be828f0"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
+      id: disk2
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x500003973be828f1"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
+      id: disk3
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
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 e318a34320f..aa111db235c 100644
--- a/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflet/nodes/chifflet-8.yaml
@@ -100,34 +100,34 @@ chifflet-8:
     version: E5-2680 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a7d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500003973c8a1a91"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: AM07
+      id: disk1
       model: PX04SMB040
       size: 400088457216
       storage: SSD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x500003973be828f3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: FJ3D
+      id: disk2
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x500003973be828e8"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: FJ3D
+      id: disk3
       model: TOSHIBA MG04ACA4
       size: 4000787030016
       storage: HDD
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 ed241186e50..1aaafc3f073 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-1.yaml
@@ -118,50 +118,50 @@ chifflot-1:
     version: Gold 6126
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b2e47"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: SCV1DL5C
+      id: disk0
       model: SSDSC2KG480G7R
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: SSDSC2KG480G7R
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
     sdd:
-      id: "disk3"
       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
+      id: disk3
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
     sde:
-      id: "disk4"
       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
+      id: disk4
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
     sdf:
-      id: "disk5"
       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
+      id: disk5
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
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 01448975bbc..6625e7bfc25 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-2.yaml
@@ -118,50 +118,50 @@ chifflot-2:
     version: Gold 6126
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2be265"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: SCV1DL5C
+      id: disk0
       model: SSDSC2KG480G7R
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: SSDSC2KG480G7R
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000039ad8128745"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:3:0"
       firmware_version: EG03
+      id: disk3
       model: MG04SCA40ENY
       size: 4000787030016
       storage: HDD
     sde:
-      id: "disk4"
       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
+      id: disk4
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
     sdf:
-      id: "disk5"
       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
+      id: disk5
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
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 88d02585330..b894d2c483d 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-3.yaml
@@ -118,50 +118,50 @@ chifflot-3:
     version: Gold 6126
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2be251"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: SCV1DL5C
+      id: disk0
       model: SSDSC2KG480G7R
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: SSDSC2KG480G7R
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: MG04SCA40ENY
       size: 4000787030016
       storage: HDD
     sdd:
-      id: "disk3"
       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
+      id: disk3
       model: MG04SCA40ENY
       size: 4000787030016
       storage: HDD
     sde:
-      id: "disk4"
       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
+      id: disk4
       model: MG04SCA40ENY
       size: 4000787030016
       storage: HDD
     sdf:
-      id: "disk5"
       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
+      id: disk5
       model: MG04SCA40ENY
       size: 4000787030016
       storage: HDD
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 5b5f66f50f6..8a5a96598fe 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-4.yaml
@@ -118,50 +118,50 @@ chifflot-4:
     version: Gold 6126
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b2e81"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: SCV1DL5C
+      id: disk0
       model: SSDSC2KG480G7R
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: SSDSC2KG480G7R
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
     sdd:
-      id: "disk3"
       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
+      id: disk3
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
     sde:
-      id: "disk4"
       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
+      id: disk4
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
     sdf:
-      id: "disk5"
       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
+      id: disk5
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
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 738403b6ecc..6f5f6964e19 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-5.yaml
@@ -118,50 +118,50 @@ chifflot-5:
     version: Gold 6126
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b2e20"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: SCV1DL5C
+      id: disk0
       model: SSDSC2KG480G7R
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: SSDSC2KG480G7R
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
     sdd:
-      id: "disk3"
       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
+      id: disk3
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
     sde:
-      id: "disk4"
       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
+      id: disk4
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
     sdf:
-      id: "disk5"
       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
+      id: disk5
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
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 aabd5f067a9..e9edccbb95e 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-6.yaml
@@ -118,50 +118,50 @@ chifflot-6:
     version: Gold 6126
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b534b"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: SCV1DL5C
+      id: disk0
       model: SSDSC2KG480G7R
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: SSDSC2KG480G7R
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
     sdd:
-      id: "disk3"
       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
+      id: disk3
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
     sde:
-      id: "disk4"
       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
+      id: disk4
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
     sdf:
-      id: "disk5"
       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
+      id: disk5
       model: ST4000NM0295
       size: 4000787030016
       storage: HDD
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 0d684b624bc..844d716306b 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-7.yaml
@@ -118,50 +118,50 @@ chifflot-7:
     version: Gold 6126
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b4d45"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: SCV1DL5C
+      id: disk0
       model: SSDSC2KG480G7R
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: SSDSC2KG480G7R
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: HUS726040ALS210
       size: 4000787030016
       storage: HDD
     sdd:
-      id: "disk3"
       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
+      id: disk3
       model: HUS726040ALS210
       size: 4000787030016
       storage: HDD
     sde:
-      id: "disk4"
       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
+      id: disk4
       model: HUS726040ALS210
       size: 4000787030016
       storage: HDD
     sdf:
-      id: "disk5"
       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
+      id: disk5
       model: HUS726040ALS210
       size: 4000787030016
       storage: HDD
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 38f7b251215..d1d9a6c2d97 100644
--- a/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.yaml
+++ b/input/grid5000/sites/lille/clusters/chifflot/nodes/chifflot-8.yaml
@@ -118,50 +118,50 @@ chifflot-8:
     version: Gold 6126
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e414f2b4d44"
       by_path: "/dev/disk/by-path/pci-0000:18:00.0-scsi-0:0:0:0"
       firmware_version: SCV1DL5C
+      id: disk0
       model: SSDSC2KG480G7R
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: SSDSC2KG480G7R
       size: 480103981056
       storage: SSD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: HUS726040ALS210
       size: 4000787030016
       storage: HDD
     sdd:
-      id: "disk3"
       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
+      id: disk3
       model: HUS726040ALS210
       size: 4000787030016
       storage: HDD
     sde:
-      id: "disk4"
       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
+      id: disk4
       model: HUS726040ALS210
       size: 4000787030016
       storage: HDD
     sdf:
-      id: "disk5"
       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
+      id: disk5
       model: HUS726040ALS210
       size: 4000787030016
       storage: HDD
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 63d0f1d72a3..38ec22d7052 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-1.yaml
@@ -65,10 +65,10 @@ petitprince-1:
     version: E5-2630L
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5003fe1ae2c"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: AA08
+      id: disk0
       model: ST9250610NS
       size: 250059350016
       storage: HDD
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 ce81129c280..c80d32c8f6a 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-10.yaml
@@ -65,10 +65,10 @@ petitprince-10:
     version: E5-2630L
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5004008bd8b"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: AA08
+      id: disk0
       model: ST9250610NS
       size: 250059350016
       storage: HDD
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 8f3f0a89ec1..1ef5926f7f3 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-11.yaml
@@ -65,10 +65,10 @@ petitprince-11:
     version: E5-2630L
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5004008c7e3"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: AA08
+      id: disk0
       model: ST9250610NS
       size: 250059350016
       storage: HDD
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 de0eaa2785e..d925436904e 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-13.yaml
@@ -65,10 +65,10 @@ petitprince-13:
     version: E5-2630L
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5003fe19270"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: AA08
+      id: disk0
       model: ST9250610NS
       size: 250059350016
       storage: HDD
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 32c74eaf2da..cd7c5255983 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-14.yaml
@@ -65,10 +65,10 @@ petitprince-14:
     version: E5-2630L
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5003fe191f2"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: AA08
+      id: disk0
       model: ST9250610NS
       size: 250059350016
       storage: HDD
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 50cc7dd527d..8b1a8374eeb 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-15.yaml
@@ -65,10 +65,10 @@ petitprince-15:
     version: E5-2630L
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5003fe1b5f9"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: AA08
+      id: disk0
       model: ST9250610NS
       size: 250059350016
       storage: HDD
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 d8e3fbc3fc3..e45da015710 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-16.yaml
@@ -65,10 +65,10 @@ petitprince-16:
     version: E5-2630L
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5003fe1aa39"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: AA08
+      id: disk0
       model: ST9250610NS
       size: 250059350016
       storage: HDD
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 1f3c750132f..3bef0166b2b 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-2.yaml
@@ -65,10 +65,10 @@ petitprince-2:
     version: E5-2630L
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5004008bb43"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: AA08
+      id: disk0
       model: ST9250610NS
       size: 250059350016
       storage: HDD
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 f706aedccdc..7f27c0fd21a 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-3.yaml
@@ -65,10 +65,10 @@ petitprince-3:
     version: E5-2630L
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5004008ccba"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: AA08
+      id: disk0
       model: ST9250610NS
       size: 250059350016
       storage: HDD
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 043da87e5d6..ce9c715a0aa 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-4.yaml
@@ -65,10 +65,10 @@ petitprince-4:
     version: E5-2630L
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5004008dba0"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: AA08
+      id: disk0
       model: ST9250610NS
       size: 250059350016
       storage: HDD
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 85340cf9bb2..936becc68f1 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-5.yaml
@@ -65,10 +65,10 @@ petitprince-5:
     version: E5-2630L
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5004008c94d"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: AA08
+      id: disk0
       model: ST9250610NS
       size: 250059350016
       storage: HDD
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 45bbed07fe2..8773c2809f9 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-6.yaml
@@ -65,10 +65,10 @@ petitprince-6:
     version: E5-2630L
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5004008cea0"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: AA08
+      id: disk0
       model: ST9250610NS
       size: 250059350016
       storage: HDD
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 45125bb3907..ec354f1f8a9 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-7.yaml
@@ -65,10 +65,10 @@ petitprince-7:
     version: E5-2630L
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5004008af8c"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: AA08
+      id: disk0
       model: ST9250610NS
       size: 250059350016
       storage: HDD
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 82d106bad3e..f877683a37f 100644
--- a/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
+++ b/input/grid5000/sites/luxembourg/clusters/petitprince/nodes/petitprince-9.yaml
@@ -65,10 +65,10 @@ petitprince-9:
     version: E5-2630L
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5004008bc53"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: AA08
+      id: disk0
       model: ST9250610NS
       size: 250059350016
       storage: HDD
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 d84808e1cec..4b4edf79d3a 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.yaml
@@ -174,42 +174,42 @@ gemini-1:
     version: E5-2698 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c40be7492"
       by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:14:0"
       firmware_version: GXM5104Q
+      id: disk0
       model: SAMSUNG MZ7KM480
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
       storage: SSD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
       storage: SSD
     sdd:
-      id: "disk3"
       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
+      id: disk3
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
       storage: SSD
     sde:
-      id: "disk4"
       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
+      id: disk4
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
       storage: SSD
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 0c74b97a21b..6181bf633a7 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.yaml
@@ -174,42 +174,42 @@ gemini-2:
     version: E5-2698 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538c40be7442"
       by_path: "/dev/disk/by-path/pci-0000:81:00.0-scsi-0:0:14:0"
       firmware_version: GXM5104Q
+      id: disk0
       model: SAMSUNG MZ7KM480
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
       storage: SSD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
       storage: SSD
     sdd:
-      id: "disk3"
       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
+      id: disk3
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
       storage: SSD
     sde:
-      id: "disk4"
       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
+      id: disk4
       model: SAMSUNG MZ7LM1T9
       size: 1920383410176
       storage: SSD
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 7b8b0278d9d..58d63804ed7 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml
@@ -82,26 +82,26 @@ hercule-1:
     version: E5-2620
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b19280d4"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D02
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 6adc2115b6c..2506bf47e71 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml
@@ -82,26 +82,26 @@ hercule-2:
     version: E5-2620
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c3d0e25"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D02
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 197ee129ab5..b93ee4ff2a9 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml
@@ -82,26 +82,26 @@ hercule-3:
     version: E5-2620
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee206e7e551"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D02
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 352272e4b2a..f72fed900d3 100644
--- a/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml
@@ -82,26 +82,26 @@ hercule-4:
     version: E5-2620
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b192dd47"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D02
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.yaml
index d218bd04cca..e99df57b007 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.yaml
@@ -153,9 +153,9 @@ neowise-1:
     version: 7642
   storage_devices:
     nvme0n1:
-      id: "disk0"
       by_id: "/dev/disk/by-id/nvme-eui.343336304e5312830025384100000001"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-nvme-1"
+      id: disk0
       model: SAMSUNG MZ1LB1T9HALS-00007
       size: 1920383410176
       storage: SSD
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.yaml
index ec6cca20a4a..656b2c3e10f 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.yaml
@@ -153,9 +153,9 @@ neowise-10:
     version: 7642
   storage_devices:
     nvme0n1:
-      id: "disk0"
       by_id: "/dev/disk/by-id/nvme-eui.343336304e6826320025384100000001"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-nvme-1"
+      id: disk0
       model: SAMSUNG MZ1LB1T9HALS-00007
       size: 1920383410176
       storage: SSD
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.yaml
index 4b2e8356da4..9862f15aa93 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.yaml
@@ -153,9 +153,9 @@ neowise-2:
     version: 7642
   storage_devices:
     nvme0n1:
-      id: "disk0"
       by_id: "/dev/disk/by-id/nvme-eui.343336304ea214240025384300000001"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-nvme-1"
+      id: disk0
       model: SAMSUNG MZ1LB1T9HALS-00007
       size: 1920383410176
       storage: SSD
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.yaml
index 74039bd7769..f686a1be02b 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.yaml
@@ -153,9 +153,9 @@ neowise-3:
     version: 7642
   storage_devices:
     nvme0n1:
-      id: "disk0"
       by_id: "/dev/disk/by-id/nvme-eui.343336304e6825260025384100000001"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-nvme-1"
+      id: disk0
       model: SAMSUNG MZ1LB1T9HALS-00007
       size: 1920383410176
       storage: SSD
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.yaml
index a22e9cb011f..c9d88c651c1 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.yaml
@@ -153,9 +153,9 @@ neowise-4:
     version: 7642
   storage_devices:
     nvme0n1:
-      id: "disk0"
       by_id: "/dev/disk/by-id/nvme-eui.343336304e6826350025384100000001"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-nvme-1"
+      id: disk0
       model: SAMSUNG MZ1LB1T9HALS-00007
       size: 1920383410176
       storage: SSD
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.yaml
index 79bd0e4c7bc..91e0e675ebc 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.yaml
@@ -153,9 +153,9 @@ neowise-5:
     version: 7642
   storage_devices:
     nvme0n1:
-      id: "disk0"
       by_id: "/dev/disk/by-id/nvme-eui.343336304ea214070025384300000001"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-nvme-1"
+      id: disk0
       model: SAMSUNG MZ1LB1T9HALS-00007
       size: 1920383410176
       storage: SSD
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.yaml
index be4f288f9e5..ef771b0270d 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.yaml
@@ -153,9 +153,9 @@ neowise-6:
     version: 7642
   storage_devices:
     nvme0n1:
-      id: "disk0"
       by_id: "/dev/disk/by-id/nvme-eui.343336304e5310840025384100000001"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-nvme-1"
+      id: disk0
       model: SAMSUNG MZ1LB1T9HALS-00007
       size: 1920383410176
       storage: SSD
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.yaml
index ae182ae1b88..bade4a3a946 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.yaml
@@ -153,9 +153,9 @@ neowise-7:
     version: 7642
   storage_devices:
     nvme0n1:
-      id: "disk0"
       by_id: "/dev/disk/by-id/nvme-eui.343336304e5312770025384100000001"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-nvme-1"
+      id: disk0
       model: SAMSUNG MZ1LB1T9HALS-00007
       size: 1920383410176
       storage: SSD
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-8.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-8.yaml
index bb7de96081c..5944eaee81d 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-8.yaml
@@ -153,9 +153,9 @@ neowise-8:
     version: 7642
   storage_devices:
     nvme0n1:
-      id: "disk0"
       by_id: "/dev/disk/by-id/nvme-eui.343336304e6826420025384100000001"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-nvme-1"
+      id: disk0
       model: SAMSUNG MZ1LB1T9HALS-00007
       size: 1920383410176
       storage: SSD
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.yaml
index 4fd9a6421e2..0bc198c5d77 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.yaml
@@ -153,9 +153,9 @@ neowise-9:
     version: 7642
   storage_devices:
     nvme0n1:
-      id: "disk0"
       by_id: "/dev/disk/by-id/nvme-eui.343336304e5312000025384100000001"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-nvme-1"
+      id: disk0
       model: SAMSUNG MZ1LB1T9HALS-00007
       size: 1920383410176
       storage: SSD
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 e59c051f0cf..6b01a16c59e 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-1.yaml
@@ -100,10 +100,10 @@ nova-1:
     version: E5-2620 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d53233001fa68207168d7a78"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 90c93383d76..92251de545a 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-10.yaml
@@ -100,10 +100,10 @@ nova-10:
     version: E5-2620 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d535c5001fa67d1b1438aaac"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 b5e7b237e16..4338e297b15 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-11.yaml
@@ -100,10 +100,10 @@ nova-11:
     version: E5-2620 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d53084001fa67d86160089a1"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 2c2861bff0c..b4c8b2ae134 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-12.yaml
@@ -100,10 +100,10 @@ nova-12:
     version: E5-2620 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d5312c001fa67da41514e86c"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 ef7a9f00091..10748c83868 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-13.yaml
@@ -100,10 +100,10 @@ nova-13:
     version: E5-2620 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d5321e001fa68240166b583d"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 142487f20c4..892f988cb48 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-14.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-14.yaml
@@ -100,10 +100,10 @@ nova-14:
     version: E5-2620 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d52ffd001fa686f21554c2ef"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 31d9a113fcc..5ec19323389 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-15.yaml
@@ -100,10 +100,10 @@ nova-15:
     version: E5-2620 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d74c2c001faf7c8917427277"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 1e260939f06..223f99e42c9 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-16.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-16.yaml
@@ -100,10 +100,10 @@ nova-16:
     version: E5-2620 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d74aa3001faf2fb9162bd980"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 24db815d48a..43d5e5238f3 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-17.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-17.yaml
@@ -100,10 +100,10 @@ nova-17:
     version: E5-2620 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d74b43001faf301d16fd06a2"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 fe8697a563c..185987c0f8e 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-18.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-18.yaml
@@ -100,10 +100,10 @@ nova-18:
     version: E5-2620 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d74c2b001faf2d6f163a704b"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 ea1fcd87e30..e2872382ecf 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-19.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-19.yaml
@@ -100,10 +100,10 @@ nova-19:
     version: E5-2620 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d532d2001faf306f1651a996"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 fbc19d52af7..d8bfdc60cdd 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-2.yaml
@@ -100,10 +100,10 @@ nova-2:
     version: E5-2620 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d5365e001fa681f6133ccb43"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 338dc0a43b5..d096f3594d4 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-20.yaml
@@ -100,10 +100,10 @@ nova-20:
     version: E5-2620 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d74b9f00234f777e59eced29"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 8edf60fc76b..a339269506a 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-21.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-21.yaml
@@ -100,10 +100,10 @@ nova-21:
     version: E5-2620 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d74c1c001faf302e172ea4cc"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 7be02accc4a..c81b8e426e3 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-22.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-22.yaml
@@ -100,10 +100,10 @@ nova-22:
     version: E5-2620 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d74ba6001faf2da114b597f7"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 ac1cc46b316..b9815c966e9 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-23.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-23.yaml
@@ -100,10 +100,10 @@ nova-23:
     version: E5-2620 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d74ba5001faf302615c2126a"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 1e335ca9924..25e867c91ce 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-3.yaml
@@ -100,10 +100,10 @@ nova-3:
     version: E5-2620 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d5312b001fa67fc516a57365"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 ca8926f8e80..1bad40e2fe7 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-4.yaml
@@ -100,10 +100,10 @@ nova-4:
     version: E5-2620 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d5321d001fa67db113e2e912"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 b8068a01524..d67b4ff5543 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-5.yaml
@@ -100,10 +100,10 @@ nova-5:
     version: E5-2620 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d5312e001fa67d9b136639e4"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 3948483972c..0ed9c5b1c6a 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-6.yaml
@@ -100,10 +100,10 @@ nova-6:
     version: E5-2620 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d53546001fa67ff81693868b"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 a3e470ef3dd..b9e617083d2 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-7.yaml
@@ -100,10 +100,10 @@ nova-7:
     version: E5-2620 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d74c1a001faf2d7213cbbd90"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 d29244c7e87..954dca1844f 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-8.yaml
@@ -100,10 +100,10 @@ nova-8:
     version: E5-2620 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d53639001fa682f814f62a7a"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 383c54b6025..d9003ea2128 100644
--- a/input/grid5000/sites/lyon/clusters/nova/nodes/nova-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/nova/nodes/nova-9.yaml
@@ -100,10 +100,10 @@ nova-9:
     version: E5-2620 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6847beb0d535ed001fa67d1a12d0d135"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Mini
       size: 598879502336
       storage: HDD
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 4afa9a209ec..d90305f24ed 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml
@@ -100,10 +100,10 @@ orion-1:
     version: E5-2630
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab2833001797384918984fca"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 f3d4ee39cee..1bcd20ca8e5 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml
@@ -100,10 +100,10 @@ orion-2:
     version: E5-2630
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab2be9002413f44f13a048ac"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 e9d16752cf8..00685730666 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml
@@ -100,10 +100,10 @@ orion-3:
     version: E5-2630
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab2bf10023c87a0a083708a4"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 1e146c1d4f3..9525fe9a694 100644
--- a/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml
@@ -100,10 +100,10 @@ orion-4:
     version: E5-2630
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab23f80017973cc4197b7ff7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 a576bfc86ce..727b612bf02 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.yaml
@@ -76,18 +76,18 @@ pyxis-1:
     version: 99xx
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538e40c53de0"
       by_path: "/dev/disk/by-path/pci-0000:0f:00.0-sas-phy2-lun-0"
       firmware_version: RVT02B6Q
+      id: disk0
       model: Samsung SSD 860
       size: 250059350016
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: Samsung SSD 860
       size: 250059350016
       storage: SSD
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 6b9dbc35d17..d3760e3e254 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.yaml
@@ -76,18 +76,18 @@ pyxis-2:
     version: 99xx
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538e40c53daf"
       by_path: "/dev/disk/by-path/pci-0000:0f:00.0-sas-phy2-lun-0"
       firmware_version: RVT02B6Q
+      id: disk0
       model: Samsung SSD 860
       size: 250059350016
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: Samsung SSD 860
       size: 250059350016
       storage: SSD
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 f2171093370..ed7d3b8afa6 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.yaml
@@ -76,18 +76,18 @@ pyxis-3:
     version: 99xx
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538e40c53de9"
       by_path: "/dev/disk/by-path/pci-0000:0f:00.0-sas-phy2-lun-0"
       firmware_version: RVT02B6Q
+      id: disk0
       model: Samsung SSD 860
       size: 250059350016
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: Samsung SSD 860
       size: 250059350016
       storage: SSD
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 7773ea41a4c..6438e3474ea 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.yaml
@@ -76,18 +76,18 @@ pyxis-4:
     version: 99xx
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5002538e40c53dea"
       by_path: "/dev/disk/by-path/pci-0000:0f:00.0-sas-phy2-lun-0"
       firmware_version: RVT02B6Q
+      id: disk0
       model: Samsung SSD 860
       size: 250059350016
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: Samsung SSD 860
       size: 250059350016
       storage: SSD
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml
index 1982dd5278d..29f3539ec6c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-10.yaml
@@ -49,9 +49,9 @@ sagittaire-10:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
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 a77886378a2..e63f1c058d2 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-11.yaml
@@ -64,9 +64,9 @@ sagittaire-11:
     version: 250
   storage_devices:
     sda:
-      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       firmware_version: 8
+      id: disk0
       model: ST373307LC
       size: 73407868928
       storage: HDD
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 60722a9f773..4ac89ccbc92 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-12.yaml
@@ -64,9 +64,9 @@ sagittaire-12:
     version: 250
   storage_devices:
     sda:
-      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       firmware_version: 8
+      id: disk0
       model: ST373307LC
       size: 73407868928
       storage: HDD
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 34a08da7271..0130dc70f0e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-13.yaml
@@ -64,9 +64,9 @@ sagittaire-13:
     version: 250
   storage_devices:
     sda:
-      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       firmware_version: 2
+      id: disk0
       model: ST373207LC
       size: 73407868928
       storage: HDD
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 055c4e50ac4..c59de4bd263 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-14.yaml
@@ -64,9 +64,9 @@ sagittaire-14:
     version: 250
   storage_devices:
     sda:
-      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       firmware_version: 2
+      id: disk0
       model: ST373207LC
       size: 73407868928
       storage: HDD
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 21e4ccede2a..1e0111e5a84 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-15.yaml
@@ -64,9 +64,9 @@ sagittaire-15:
     version: 250
   storage_devices:
     sda:
-      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       firmware_version: 2
+      id: disk0
       model: ST373207LC
       size: 73407868928
       storage: HDD
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 62b3ecff011..60c06fc64da 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-16.yaml
@@ -64,9 +64,9 @@ sagittaire-16:
     version: 250
   storage_devices:
     sda:
-      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       firmware_version: 2
+      id: disk0
       model: ST373207LC
       size: 73407868928
       storage: HDD
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 2ad91b0bea8..dea22c22bd6 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-17.yaml
@@ -64,9 +64,9 @@ sagittaire-17:
     version: 250
   storage_devices:
     sda:
-      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       firmware_version: 104
+      id: disk0
       model: MAT3073NC
       size: 73543163904
       storage: HDD
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 2386fb7019c..e5456a170c6 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-18.yaml
@@ -64,9 +64,9 @@ sagittaire-18:
     version: 250
   storage_devices:
     sda:
-      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       firmware_version: 2
+      id: disk0
       model: ST373207LC
       size: 73407868928
       storage: HDD
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 d7042022e02..6a1a03856b0 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-2.yaml
@@ -64,9 +64,9 @@ sagittaire-2:
     version: 250
   storage_devices:
     sda:
-      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       firmware_version: 2
+      id: disk0
       model: ST373207LC
       size: 73407868928
       storage: HDD
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 65bbbe7d3ba..f9f77d01bc4 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-20.yaml
@@ -64,9 +64,9 @@ sagittaire-20:
     version: 250
   storage_devices:
     sda:
-      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       firmware_version: 2
+      id: disk0
       model: ST373207LC
       size: 73407868928
       storage: HDD
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml
index b204371e052..e492ed5cbe2 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-21.yaml
@@ -49,9 +49,9 @@ sagittaire-21:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml
index 91aff8716f5..61264c83d4e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-22.yaml
@@ -46,9 +46,9 @@ sagittaire-22:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       by_id: ''
+      id: disk0
       model: ST373207LC
       rev: 2
       size: 73407868928
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml
index 04c301f48a9..f1234f0bf3c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-23.yaml
@@ -46,9 +46,9 @@ sagittaire-23:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       by_id: ''
+      id: disk0
       model: MAT3073NC
       rev: 104
       size: 73543163904
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml
index 5aa560fd0bd..3e4b4402d6f 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-25.yaml
@@ -49,9 +49,9 @@ sagittaire-25:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml
index eb340c9ac6a..03ad93be83b 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-26.yaml
@@ -49,9 +49,9 @@ sagittaire-26:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: MAT3073NC
       rev: 104
+      id: disk0
       size: 73543163904
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml
index 7a4bea901d6..b67006ab289 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-28.yaml
@@ -49,9 +49,9 @@ sagittaire-28:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   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 8ac7f21966a..6abb7b5b274 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-3.yaml
@@ -64,9 +64,9 @@ sagittaire-3:
     version: 250
   storage_devices:
     sda:
-      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       firmware_version: 2
+      id: disk0
       model: ST373207LC
       size: 73407868928
       storage: HDD
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml
index f4576f2c5cf..eb1dcb5179d 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-32.yaml
@@ -54,10 +54,10 @@ sagittaire-32:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       by_id: ''
       firmware_version: 104
+      id: disk0
       model: MAT3073NC
       size: 73543163904
   supported_job_types:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml
index 1920fd6a374..c2f4a2edcc9 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-33.yaml
@@ -54,10 +54,10 @@ sagittaire-33:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       by_id: ''
       firmware_version: 104
+      id: disk0
       model: MAT3073NC
       size: 73543163904
   supported_job_types:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml
index 9c3b8c7350e..3b3a213ec30 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-34.yaml
@@ -54,10 +54,10 @@ sagittaire-34:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       by_id: ''
       firmware_version: 104
+      id: disk0
       model: MAT3073NC
       size: 73543163904
   supported_job_types:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml
index 1474636b4a4..3a5af1c6c55 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-35.yaml
@@ -49,9 +49,9 @@ sagittaire-35:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml
index da81ad6b965..5b477e24ae8 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-36.yaml
@@ -49,9 +49,9 @@ sagittaire-36:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml
index fad8135e079..9f10ecd48d6 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-37.yaml
@@ -49,9 +49,9 @@ sagittaire-37:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml
index 461ead1b027..c7f4c24b0aa 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-38.yaml
@@ -48,9 +48,9 @@ sagittaire-38:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2.0
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml
index fb7e23d2bd1..9a1b3fdf01c 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-39.yaml
@@ -48,9 +48,9 @@ sagittaire-39:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: MAT3073NC
       rev: 104.0
+      id: disk0
       size: 73543163904
   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 2f57798072b..168dade74c5 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-4.yaml
@@ -64,9 +64,9 @@ sagittaire-4:
     version: 250
   storage_devices:
     sda:
-      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       firmware_version: 2
+      id: disk0
       model: ST373207LC
       size: 73407868928
       storage: HDD
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml
index 57f93922c32..b33442e06f3 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-40.yaml
@@ -48,9 +48,9 @@ sagittaire-40:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml
index dce2034b77e..797b758d866 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-41.yaml
@@ -49,9 +49,9 @@ sagittaire-41:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml
index 160639f2675..1a89cfef0a1 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-42.yaml
@@ -48,9 +48,9 @@ sagittaire-42:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: MAT3073NC
       rev: 104.0
+      id: disk0
       size: 73543163904
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml
index e7a22983485..dcd5ed2d831 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-43.yaml
@@ -54,10 +54,10 @@ sagittaire-43:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       by_id: ''
       firmware_version: 2
+      id: disk0
       model: ST373207LC
       size: 73407868928
   supported_job_types:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml
index 00e9229aece..f56d0c6e16f 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-44.yaml
@@ -54,10 +54,10 @@ sagittaire-44:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       by_id: ''
       firmware_version: 104
+      id: disk0
       model: MAT3073NC
       size: 73543163904
   supported_job_types:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml
index 3c64a3160bc..67ac0f3ab48 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-45.yaml
@@ -46,9 +46,9 @@ sagittaire-45:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       by_id: ''
+      id: disk0
       model: MAT3073NC
       rev: 104
       size: 73543163904
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml
index 5ade5ac1021..e7b5137180f 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-47.yaml
@@ -54,10 +54,10 @@ sagittaire-47:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       by_id: ''
       firmware_version: 2
+      id: disk0
       model: ST373207LC
       size: 73407868928
   supported_job_types:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml
index f69b3737468..51e3835a09e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-48.yaml
@@ -54,10 +54,10 @@ sagittaire-48:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       by_id: ''
       firmware_version: 104
+      id: disk0
       model: MAT3073NC
       size: 73543163904
   supported_job_types:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml
index a67f3d24fa6..d138d772913 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-49.yaml
@@ -54,10 +54,10 @@ sagittaire-49:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       by_id: ''
       firmware_version: 2
+      id: disk0
       model: ST373207LC
       size: 73407868928
   supported_job_types:
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 1727bc8ca1c..9a518873ce0 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-5.yaml
@@ -64,9 +64,9 @@ sagittaire-5:
     version: 250
   storage_devices:
     sda:
-      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       firmware_version: 2
+      id: disk0
       model: ST373207LC
       size: 73407868928
       storage: HDD
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml
index 07e2a5f707a..b27b48d3dfb 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-50.yaml
@@ -54,10 +54,10 @@ sagittaire-50:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       by_id: ''
       firmware_version: 2
+      id: disk0
       model: ST373207LC
       size: 73407868928
   supported_job_types:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml
index 506b8332a1f..5b75568f0e7 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-51.yaml
@@ -54,10 +54,10 @@ sagittaire-51:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       by_id: ''
       firmware_version: 2
+      id: disk0
       model: ST373207LC
       size: 73407868928
   supported_job_types:
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml
index cadf08759d3..6664e08c49d 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-52.yaml
@@ -52,9 +52,9 @@ sagittaire-52:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: MAT3073NC
       rev: 104.0
+      id: disk0
       size: 73543163904
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml
index 4a7e2c0f496..f9bbc6fbfb6 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-53.yaml
@@ -48,9 +48,9 @@ sagittaire-53:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: MAT3073NC
       rev: 104.0
+      id: disk0
       size: 73543163904
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml
index 1c0fa8afed9..f72b4752bb5 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-54.yaml
@@ -48,9 +48,9 @@ sagittaire-54:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2.0
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml
index 8f7e2de9073..cd0bb59d729 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-55.yaml
@@ -48,9 +48,9 @@ sagittaire-55:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2.0
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml
index 74d00355271..d055d3127b8 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-56.yaml
@@ -48,9 +48,9 @@ sagittaire-56:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: MAT3073NC
       rev: 104.0
+      id: disk0
       size: 73543163904
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml
index ab858c978a6..7dfdf14b01d 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-57.yaml
@@ -48,9 +48,9 @@ sagittaire-57:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: MAT3073NC
       rev: 104.0
+      id: disk0
       size: 73543163904
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml
index 365f76dc407..739eb46c64a 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-58.yaml
@@ -48,9 +48,9 @@ sagittaire-58:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2.0
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml
index c6217f28c59..bca2381f5cb 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-59.yaml
@@ -48,9 +48,9 @@ sagittaire-59:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2.0
+      id: disk0
       size: 73407868928
   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 d6825f3f13a..946cdcb6856 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-6.yaml
@@ -64,9 +64,9 @@ sagittaire-6:
     version: 250
   storage_devices:
     sda:
-      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       firmware_version: 2
+      id: disk0
       model: ST373207LC
       size: 73407868928
       storage: HDD
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml
index ffdb6ae3664..e0e10c6b12e 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-60.yaml
@@ -49,9 +49,9 @@ sagittaire-60:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2.0
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml
index 992399b3429..e8e712e6eca 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-61.yaml
@@ -48,9 +48,9 @@ sagittaire-61:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: MAT3073NC
       rev: 104.0
+      id: disk0
       size: 73543163904
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml
index 90b6c57c75b..616e4a36669 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-62.yaml
@@ -48,9 +48,9 @@ sagittaire-62:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml
index 5a17f1746e2..defbfbbc78d 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-63.yaml
@@ -48,9 +48,9 @@ sagittaire-63:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: MAT3073NC
       rev: 104.0
+      id: disk0
       size: 73543163904
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml
index c2b2a452a1b..d39ecc9bb7f 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-64.yaml
@@ -48,9 +48,9 @@ sagittaire-64:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: MAT3073NC
       rev: 104.0
+      id: disk0
       size: 73543163904
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml
index de4f7ddbaef..f5c18ffde3a 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-65.yaml
@@ -48,9 +48,9 @@ sagittaire-65:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2.0
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml
index f3ac2784326..15d4da5e11b 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-66.yaml
@@ -48,9 +48,9 @@ sagittaire-66:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: MAT3073NC
       rev: 104.0
+      id: disk0
       size: 73543163904
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml
index bb23e807758..c155364c6dd 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-67.yaml
@@ -48,9 +48,9 @@ sagittaire-67:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: MAT3073NC
       rev: 104.0
+      id: disk0
       size: 73543163904
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml
index 498ef58a895..d427435f33a 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-68.yaml
@@ -49,9 +49,9 @@ sagittaire-68:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml
index 5805c932b46..d6eb511d870 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-69.yaml
@@ -48,9 +48,9 @@ sagittaire-69:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: MAT3073NC
       rev: 104.0
+      id: disk0
       size: 73543163904
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml
index f6764e3c11b..e6e01cf8c72 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-70.yaml
@@ -48,9 +48,9 @@ sagittaire-70:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml
index 8f86f70743b..800209f4450 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-71.yaml
@@ -48,9 +48,9 @@ sagittaire-71:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2.0
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml
index 3dbb450408c..1a4b0ca9f2b 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-72.yaml
@@ -48,9 +48,9 @@ sagittaire-72:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2.0
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
index 1233b1e795e..8d281549f48 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-73.yaml
@@ -49,9 +49,9 @@ sagittaire-73:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml
index 1c448fac3f1..470901e11cd 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-74.yaml
@@ -48,9 +48,9 @@ sagittaire-74:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2.0
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml
index e6e79d08aa7..7198904cca5 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-75.yaml
@@ -48,9 +48,9 @@ sagittaire-75:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2.0
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml
index a2a05721c1d..c96b0c5e3ac 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-76.yaml
@@ -49,9 +49,9 @@ sagittaire-76:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml
index 328d81ac25f..8323b6ccbae 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-77.yaml
@@ -49,9 +49,9 @@ sagittaire-77:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: MAT3073NC
       rev: 104.0
+      id: disk0
       size: 73543163904
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml
index 46dd61fc3b3..6638bbf012f 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-78.yaml
@@ -48,9 +48,9 @@ sagittaire-78:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2.0
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml
index 778a8985a98..2b56c69b4d3 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-79.yaml
@@ -49,9 +49,9 @@ sagittaire-79:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml
index 5d33544aee1..1541168c925 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-8.yaml
@@ -49,9 +49,9 @@ sagittaire-8:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       model: ST373207LC
       rev: 2
+      id: disk0
       size: 73407868928
   supported_job_types:
     virtual: false
diff --git a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml
index 1eb0e0d6e4a..0ae2e4b03e2 100644
--- a/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/sagittaire/nodes/sagittaire-9.yaml
@@ -46,9 +46,9 @@ sagittaire-9:
     microcode: '0x3a'
   storage_devices:
     sda:
-      id: "disk0"
       by_path: "/dev/disk/by-path/pci-0000:02:04.0-scsi-0:0:1:0"
       by_id: ''
+      id: disk0
       model: MAT3073NC
       rev: 104
       size: 73543163904
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 d7daba7a4c8..7324eae4958 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.yaml
@@ -100,10 +100,10 @@ taurus-1:
     version: E5-2630
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520a8f749001794133a1901fbeb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 f78a101b6aa..c63fd5d9bd4 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.yaml
@@ -100,10 +100,10 @@ taurus-10:
     version: E5-2630
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab2d71001794106618de059e"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 37013a21015..52c6a7c9819 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.yaml
@@ -100,10 +100,10 @@ taurus-11:
     version: E5-2630
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab02df00179417e61a87aa8b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 136b3b00b2a..539d95f589e 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
@@ -100,10 +100,10 @@ taurus-12:
     version: E5-2630
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab2dde00206e64f90adcd6db"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 89fa5c10bc7..dad2ffcad6c 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.yaml
@@ -100,10 +100,10 @@ taurus-13:
     version: E5-2630
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab2d7b00278996fb095bd97c"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 3911a8fd6de..e5a54c4a50b 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.yaml
@@ -100,10 +100,10 @@ taurus-15:
     version: E5-2630
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x690b11c0fc5d890026074ba81857618f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.yaml
index d7ec3a450a3..9d95be0bf94 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.yaml
@@ -89,10 +89,10 @@ taurus-16:
     microcode: '0x71a'
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab2dfd00237465b82e77e450"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
+      id: disk0
       model: PERC H710
       size: 598879502336
   supported_job_types:
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 b396116674f..5cc498909f3 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.yaml
@@ -100,10 +100,10 @@ taurus-3:
     version: E5-2630
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab2de700179413fb1a5c8553"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 775b6bbfd29..aa76bc786be 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.yaml
@@ -100,10 +100,10 @@ taurus-4:
     version: E5-2630
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab02c6001794153119121d98"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 1a08316378f..da0b35c7903 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.yaml
@@ -100,10 +100,10 @@ taurus-5:
     version: E5-2630
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab2d7600179410c91a4000d4"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 02cfb5f9e70..25efc15cbe9 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.yaml
@@ -100,10 +100,10 @@ taurus-6:
     version: E5-2630
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab02ea001794410a1a9ff888"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 f39a3c89393..1bf50bcf22e 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.yaml
@@ -100,10 +100,10 @@ taurus-7:
     version: E5-2630
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab2d920017940fb418668c7f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 901755dfea4..658b3aa48e6 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.yaml
@@ -100,10 +100,10 @@ taurus-8:
     version: E5-2630
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab2df600266a64ef0b08c365"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 8bc068bba16..fbc2f19e18a 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.yaml
@@ -100,10 +100,10 @@ taurus-9:
     version: E5-2630
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6d4ae520ab02d8001794204419fec70f"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 3.13
+      id: disk0
       model: PERC H710
       size: 598879502336
       storage: HDD
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 5809c63702f..4f32634183c 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.yaml
@@ -115,10 +115,10 @@ graffiti-1:
     version: Silver 4110
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6f402700aefea00024afe4c307e10af8"
       by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Adp
       size: 479559942144
       storage: HDD
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 988585dfc18..dc245bdcaf9 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.yaml
@@ -115,10 +115,10 @@ graffiti-10:
     version: Silver 4110
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6f402700aee1d70024a7bff804ec6e41"
       by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Adp
       size: 479559942144
       storage: HDD
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 53991b04334..5d2706bb9fa 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.yaml
@@ -115,10 +115,10 @@ graffiti-11:
     version: Silver 4110
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6f402700aeff5e0024a7bfd604d35be4"
       by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Adp
       size: 479559942144
       storage: HDD
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 55bd982e170..6550b2e7ffc 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.yaml
@@ -115,10 +115,10 @@ graffiti-12:
     version: Silver 4110
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6f402700aee17b0024a7bff104dc6471"
       by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Adp
       size: 479559942144
       storage: HDD
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 ff9edb2726b..d5dc3b79f4c 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.yaml
@@ -115,10 +115,10 @@ graffiti-13:
     version: Silver 4110
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6f402700aefd8f0024a7bfe304e28a0a"
       by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Adp
       size: 479559942144
       storage: HDD
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 f56e4fcd128..83539cad4e7 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.yaml
@@ -115,10 +115,10 @@ graffiti-2:
     version: Silver 4110
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6f402700aeff430024929b4003cd51d0"
       by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Adp
       size: 479559942144
       storage: HDD
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 e6235b640b8..3bfb1eb7c06 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.yaml
@@ -115,10 +115,10 @@ graffiti-3:
     version: Silver 4110
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6f402700aeff440024a3cc780477d47a"
       by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Adp
       size: 479559942144
       storage: HDD
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 9f941a9388d..eb7754206c6 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.yaml
@@ -115,10 +115,10 @@ graffiti-4:
     version: Silver 4110
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6f402700aeff390024a4aab5047b5f32"
       by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Adp
       size: 479559942144
       storage: HDD
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 9488c87eabd..49fe2d46cf3 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.yaml
@@ -115,10 +115,10 @@ graffiti-5:
     version: Silver 4110
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6f402700aeff410024968a9d0538bf26"
       by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Adp
       size: 479559942144
       storage: HDD
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 ff66a256f45..952b602adaf 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.yaml
@@ -115,10 +115,10 @@ graffiti-6:
     version: Silver 4110
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6f402700aefe4c0024955d700575177b"
       by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Adp
       size: 479559942144
       storage: HDD
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 53dc6897930..746f2692489 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.yaml
@@ -115,10 +115,10 @@ graffiti-7:
     version: Silver 4110
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6f402700aeff3f00249d84d7048679f0"
       by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Adp
       size: 479559942144
       storage: HDD
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 4b56e4d1f11..d0144e06c9d 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.yaml
@@ -115,10 +115,10 @@ graffiti-8:
     version: Silver 4110
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6f402700aefdcb0024a4ae6f048773e6"
       by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Adp
       size: 479559942144
       storage: HDD
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 dbd3d35520a..e7c7c6f0a0e 100644
--- a/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.yaml
@@ -115,10 +115,10 @@ graffiti-9:
     version: Silver 4110
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6f402700aeff350024a7bfd004f0af67"
       by_path: "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Adp
       size: 479559942144
       storage: HDD
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 5178b696148..7943de8eca6 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.yaml
@@ -112,18 +112,18 @@ graoully-1:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5107cf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e41b51f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 cc21568bc5b..2a03171e8f4 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.yaml
@@ -112,18 +112,18 @@ graoully-10:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51463f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510003"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 b43e8de8d63..d40e693cd5c 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.yaml
@@ -112,18 +112,18 @@ graoully-11:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510dc3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510db3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 aec5c8fd9b3..05a1756e2e6 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.yaml
@@ -112,18 +112,18 @@ graoully-12:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e501d67"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4ffb43"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 3b59b920a30..136b059c92e 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.yaml
@@ -112,18 +112,18 @@ graoully-13:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5025ff"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e46fd17"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 53062021ee4..e2466431342 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.yaml
@@ -112,18 +112,18 @@ graoully-14:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5139cb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fcfcf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 6d6911a25d0..2526900e4b1 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.yaml
@@ -112,18 +112,18 @@ graoully-15:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5142bf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4ffecf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 01111d5e3a7..2c248e5f556 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.yaml
@@ -112,18 +112,18 @@ graoully-16:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f98b7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5149f3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 2c28529ec6f..52cf92a262d 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.yaml
@@ -112,18 +112,18 @@ graoully-2:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e43b127"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e43a327"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 b57add965a3..069574a2509 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.yaml
@@ -112,18 +112,18 @@ graoully-3:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f97ff"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50e823"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 e69e54afc6a..8d0f83cdba7 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.yaml
@@ -112,18 +112,18 @@ graoully-4:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50f9fb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50db0b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 ffb31c7573a..5ca98b12bf5 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.yaml
@@ -112,18 +112,18 @@ graoully-5:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50fd3b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5141a3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 9b8898acfeb..34b6701185c 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.yaml
@@ -112,18 +112,18 @@ graoully-6:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51070b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50f367"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 83140815993..41be199a52c 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.yaml
@@ -112,18 +112,18 @@ graoully-7:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5115c3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51369b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 0e6b2f7a0bc..e596366c50d 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.yaml
@@ -112,18 +112,18 @@ graoully-8:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f9837"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fc813"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 13b16b75170..e2fe3c0207e 100644
--- a/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.yaml
@@ -112,18 +112,18 @@ graoully-9:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50e497"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5012db"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 d6815d360e3..34477b09dd1 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.yaml
@@ -111,10 +111,10 @@ graphique-1:
     version: E5-2620 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6b083fe0d4f321001c1251a311fe7e14"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Mini
       size: 299439751168
       storage: HDD
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 e6be7f8a4c6..099fa3b38d3 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.yaml
@@ -111,10 +111,10 @@ graphique-2:
     version: E5-2620 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x644a8420018050001c7e477b12eb7708"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Mini
       size: 299439751168
       storage: HDD
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 f497b20f771..5aafa7c0d84 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.yaml
@@ -111,10 +111,10 @@ graphique-3:
     version: E5-2620 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x644a842001804c001c7e47d012cad591"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Mini
       size: 299439751168
       storage: HDD
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 d0f6529adca..9f6a98c3c3e 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.yaml
@@ -111,10 +111,10 @@ graphique-4:
     version: E5-2620 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x644a8420018129001c7e47be1348b9b1"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Mini
       size: 299439751168
       storage: HDD
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 ca725a73374..0e4813ed28e 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.yaml
@@ -111,10 +111,10 @@ graphique-5:
     version: E5-2620 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x6b083fe0e25cdc001c7e479d12b4ee36"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Mini
       size: 299439751168
       storage: HDD
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 2e3005a1715..fec6b144d86 100644
--- a/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.yaml
@@ -111,10 +111,10 @@ graphique-6:
     version: E5-2620 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x644a842013b8c4001caf39ba130a14d7"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H330 Mini
       size: 299439751168
       storage: HDD
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 20b463f18e2..a545324b2a3 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.yaml
@@ -94,18 +94,18 @@ graphite-1:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50015178f368070b"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
       firmware_version: D201DL13
+      id: disk0
       model: INTEL SSDSC2BB30
       size: 300069052416
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: INTEL SSDSC2BB30
       size: 300069052416
       storage: SSD
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 a181d002134..e72c572c049 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.yaml
@@ -94,18 +94,18 @@ graphite-2:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50015178f36802db"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
       firmware_version: D201DL13
+      id: disk0
       model: INTEL SSDSC2BB30
       size: 300069052416
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: INTEL SSDSC2BB30
       size: 300069052416
       storage: SSD
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 d7dfcb0d360..2213c51faff 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.yaml
@@ -94,18 +94,18 @@ graphite-3:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50015178f367f896"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
       firmware_version: D201DL13
+      id: disk0
       model: INTEL SSDSC2BB30
       size: 300069052416
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: INTEL SSDSC2BB30
       size: 300069052416
       storage: SSD
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 2184129d568..2b7bb76547c 100644
--- a/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.yaml
@@ -94,18 +94,18 @@ graphite-4:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50015178f36802eb"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
       firmware_version: D201DL13
+      id: disk0
       model: INTEL SSDSC2BB30
       size: 300069052416
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: INTEL SSDSC2BB30
       size: 300069052416
       storage: SSD
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 187e24156df..5ac411b0fce 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-1.yaml
@@ -100,18 +100,18 @@ grappe-1:
     version: Gold 5218R
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151ee846f"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
+      id: disk0
       model: SSDSC2KG480G8R
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 826d235ffc0..d40221e1a83 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-10.yaml
@@ -100,18 +100,18 @@ grappe-10:
     version: Gold 5218R
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151eeb3be"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
+      id: disk0
       model: SSDSC2KG480G8R
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 c282394156b..f49a940981e 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-11.yaml
@@ -100,18 +100,18 @@ grappe-11:
     version: Gold 5218R
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151f0d585"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
+      id: disk0
       model: SSDSC2KG480G8R
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 e9a6a86d691..4918c440b3c 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-12.yaml
@@ -100,18 +100,18 @@ grappe-12:
     version: Gold 5218R
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151f1fed9"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
+      id: disk0
       model: SSDSC2KG480G8R
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 a7b9f5d6548..89362a6e6c8 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-13.yaml
@@ -100,18 +100,18 @@ grappe-13:
     version: Gold 5218R
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151ee5c16"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
+      id: disk0
       model: SSDSC2KG480G8R
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 4fb6db8fd07..cd4f510c5f1 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-14.yaml
@@ -100,18 +100,18 @@ grappe-14:
     version: Gold 5218R
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151eecad9"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
+      id: disk0
       model: SSDSC2KG480G8R
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 ac02fcfe18d..456a2fcb56f 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-15.yaml
@@ -100,18 +100,18 @@ grappe-15:
     version: Gold 5218R
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151eeb3dc"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
+      id: disk0
       model: SSDSC2KG480G8R
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 9f232385587..0b56a838931 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-16.yaml
@@ -100,18 +100,18 @@ grappe-16:
     version: Gold 5218R
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151eeca96"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
+      id: disk0
       model: SSDSC2KG480G8R
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 47501afde99..0155fcd046c 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-2.yaml
@@ -100,18 +100,18 @@ grappe-2:
     version: Gold 5218R
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151eeb056"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
+      id: disk0
       model: SSDSC2KG480G8R
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 53a94910614..68c3ab232b9 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-3.yaml
@@ -100,18 +100,18 @@ grappe-3:
     version: Gold 5218R
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151eeca87"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
+      id: disk0
       model: SSDSC2KG480G8R
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 5987c7f977a..d2fa0ab7a1b 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-4.yaml
@@ -100,18 +100,18 @@ grappe-4:
     version: Gold 5218R
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151ee593a"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
+      id: disk0
       model: SSDSC2KG480G8R
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 f8f52443452..67f524c0d32 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-5.yaml
@@ -100,18 +100,18 @@ grappe-5:
     version: Gold 5218R
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151eeca8a"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
+      id: disk0
       model: SSDSC2KG480G8R
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 bcfe31f51c7..632cdbf8d39 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-6.yaml
@@ -100,18 +100,18 @@ grappe-6:
     version: Gold 5218R
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151f1a33f"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
+      id: disk0
       model: SSDSC2KG480G8R
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 3850e99f9a3..c68d5594992 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-7.yaml
@@ -100,18 +100,18 @@ grappe-7:
     version: Gold 5218R
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151ee59cb"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
+      id: disk0
       model: SSDSC2KG480G8R
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 4c7b0033464..cbfedd7db3d 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-8.yaml
@@ -100,18 +100,18 @@ grappe-8:
     version: Gold 5218R
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151eeca8e"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
+      id: disk0
       model: SSDSC2KG480G8R
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 2f7be32e059..e5f68247e56 100644
--- a/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grappe/nodes/grappe-9.yaml
@@ -100,18 +100,18 @@ grappe-9:
     version: Gold 5218R
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x55cd2e4151f14f38"
       by_path: "/dev/disk/by-path/pci-0000:1a:00.0-scsi-0:0:0:0"
       firmware_version: XCV1DL67
+      id: disk0
       model: SSDSC2KG480G8R
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: ST8000NM0185
       size: 8001563222016
       storage: HDD
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 024aca0dcec..71bf45b94d3 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.yaml
@@ -76,10 +76,10 @@ grcinq-1:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50087efe115"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GA0F
+      id: disk0
       model: ST1000NM0033-9ZM
       size: 1000204886016
       storage: HDD
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 645ffe1c892..92366285778 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.yaml
@@ -76,10 +76,10 @@ grcinq-10:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee208247520"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 df5eea70c5a..8817423e0fa 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.yaml
@@ -76,10 +76,10 @@ grcinq-11:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2cd938a"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 fa2f0fca993..29cf037ffda 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.yaml
@@ -76,10 +76,10 @@ grcinq-12:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2cf5191"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 513a77cd7d1..c10fe47304f 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.yaml
@@ -76,10 +76,10 @@ grcinq-13:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee208314962"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 1ec10339fae..e0fe9b83178 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.yaml
@@ -76,10 +76,10 @@ grcinq-14:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2dc2314"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 e62d6358fb9..78900a6456d 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.yaml
@@ -76,10 +76,10 @@ grcinq-15:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee208313f95"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 117400f867f..b90d8018b6d 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.yaml
@@ -76,10 +76,10 @@ grcinq-16:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2083170d8"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 7b7810ec9ce..5732ed676e6 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.yaml
@@ -76,10 +76,10 @@ grcinq-17:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee208247730"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 0bf814e2842..248131a99c7 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.yaml
@@ -76,10 +76,10 @@ grcinq-18:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500659322ef"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GA06
+      id: disk0
       model: ST1000NM0033-9ZM
       size: 1000204886016
       storage: HDD
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 9fd891fd678..86c178a2a08 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.yaml
@@ -76,10 +76,10 @@ grcinq-19:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2ceaef2"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 b74c991333d..fb0c7781e4b 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.yaml
@@ -76,10 +76,10 @@ grcinq-2:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee208259c90"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 4666a116711..4eb180db434 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.yaml
@@ -76,10 +76,10 @@ grcinq-20:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2cee7d4"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 7e83f484ee6..5c007a357d7 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.yaml
@@ -76,10 +76,10 @@ grcinq-21:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2dc2c28"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 164ad607130..0eb42e6c0ed 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.yaml
@@ -76,10 +76,10 @@ grcinq-22:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2dbf9a3"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 c3aa2ee8699..cd207c27de8 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.yaml
@@ -76,10 +76,10 @@ grcinq-23:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2083161d6"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 77aadbdf117..3144d2b09ce 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.yaml
@@ -76,10 +76,10 @@ grcinq-24:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2dc001d"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 24c4ac9323b..8311eb76cff 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.yaml
@@ -76,10 +76,10 @@ grcinq-25:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25d868c64"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 2e0ba2a0b63..077ff1483cc 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.yaml
@@ -76,10 +76,10 @@ grcinq-26:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25d775fd3"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 61899a7df28..1f865429553 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.yaml
@@ -76,10 +76,10 @@ grcinq-27:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee208313898"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 5399192c2e2..fe228b5765f 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.yaml
@@ -76,10 +76,10 @@ grcinq-28:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25d797854"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 b1bbab84c99..edb678a6760 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.yaml
@@ -76,10 +76,10 @@ grcinq-29:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2ce20d1"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 24dd678bff8..1dd4226bc6a 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.yaml
@@ -76,10 +76,10 @@ grcinq-3:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2d18aac"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 79e7cabb0b5..1a0fefaddb1 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.yaml
@@ -76,10 +76,10 @@ grcinq-30:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50092453590"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GA10
+      id: disk0
       model: ST1000NM0033-9ZM
       size: 1000204886016
       storage: HDD
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 964ab8c877b..ad4b51dc182 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.yaml
@@ -76,10 +76,10 @@ grcinq-31:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee20824212d"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 0f0b7ebca48..57d3921f76b 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.yaml
@@ -76,10 +76,10 @@ grcinq-32:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2c4db06"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 d8dd6fcdafd..8bedee06224 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.yaml
@@ -76,10 +76,10 @@ grcinq-33:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2083156f7"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 3829473110c..33ae2e99ff3 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.yaml
@@ -76,10 +76,10 @@ grcinq-34:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25d866c80"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 bed4733f268..88afb0b7230 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.yaml
@@ -76,10 +76,10 @@ grcinq-35:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2cf5b39"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 6ad38d7ed51..eb652c15048 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.yaml
@@ -76,10 +76,10 @@ grcinq-36:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2cf0b6a"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 f16d4128757..8610c985aae 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.yaml
@@ -76,10 +76,10 @@ grcinq-37:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25d868aef"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 f612a2b38d3..f94eb5283e2 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.yaml
@@ -76,10 +76,10 @@ grcinq-38:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee208314bc1"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 c487fb72d3d..0113a6267b4 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.yaml
@@ -76,10 +76,10 @@ grcinq-39:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2dc0a00"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 4f40c1431bc..1dba74288b1 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.yaml
@@ -76,10 +76,10 @@ grcinq-4:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25d790253"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 d43501b8050..6ece3e41d59 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.yaml
@@ -76,10 +76,10 @@ grcinq-40:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee208314d3b"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 3acc1d2adb9..2cd7201df94 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.yaml
@@ -76,10 +76,10 @@ grcinq-41:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25d86771f"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 b3bcffdba21..a56e2066679 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.yaml
@@ -76,10 +76,10 @@ grcinq-42:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee20831444a"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 510a32930d1..d4965cb15e4 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.yaml
@@ -76,10 +76,10 @@ grcinq-43:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b2dc1784"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 009bf2e8c7b..7ed150d182b 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.yaml
@@ -76,10 +76,10 @@ grcinq-44:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee208313f9a"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 f9dae20f62e..40adc95a9a6 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.yaml
@@ -76,10 +76,10 @@ grcinq-45:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee20823da5d"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 eab7d2450f7..fed24f98187 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.yaml
@@ -76,10 +76,10 @@ grcinq-46:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50092454854"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GA10
+      id: disk0
       model: ST1000NM0033-9ZM
       size: 1000204886016
       storage: HDD
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 cc12789266f..93ea000060b 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.yaml
@@ -76,10 +76,10 @@ grcinq-47:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25d79a099"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 ba994eee637..b93f343060b 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.yaml
@@ -76,10 +76,10 @@ grcinq-5:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50092f6a804"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GA10
+      id: disk0
       model: ST1000NM0033-9ZM
       size: 1000204886016
       storage: HDD
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 6fa412ea6b9..2020f0182ee 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.yaml
@@ -76,10 +76,10 @@ grcinq-6:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee208243d9c"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 87ea65ddf59..b625c5e23bc 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.yaml
@@ -76,10 +76,10 @@ grcinq-7:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee208238864"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 dfaee4c1315..bd96363a209 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.yaml
@@ -76,10 +76,10 @@ grcinq-8:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50090f7b98a"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GA0F
+      id: disk0
       model: ST1000NM0033-9ZM
       size: 1000204886016
       storage: HDD
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 a054015e9a4..9397b2a6f40 100644
--- a/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.yaml
@@ -76,10 +76,10 @@ grcinq-9:
     version: E5-2650
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25d79b6e9"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01V03
+      id: disk0
       model: WDC WD1003FBYX-1
       size: 1000204886016
       storage: HDD
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 401e025008e..26474e686fb 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-1.yaml
@@ -111,18 +111,18 @@ grele-1:
     version: E5-2650 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed290020f0ff3b04942750"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed290020f0ff3c049eabaa"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
+      id: disk1
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
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 1290a55251e..affd28e79a2 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-10.yaml
@@ -111,18 +111,18 @@ grele-10:
     version: E5-2650 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed620020f1032d04bba445"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed620020f1032e04c5f7ae"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
+      id: disk1
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
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 b171f2b41cf..92bdf3670e9 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-11.yaml
@@ -111,18 +111,18 @@ grele-11:
     version: E5-2650 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b71d4a0020f1032c04b9cf50"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b71d4a0020f1032d04c9185d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
+      id: disk1
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
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 45f4ea0b91e..a590934705b 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-12.yaml
@@ -111,18 +111,18 @@ grele-12:
     version: E5-2650 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed4e0020f1032d04b82e62"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed4e0020f1032d04c2acf4"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
+      id: disk1
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
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 f2b0c81ebca..74ee10a82c7 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-13.yaml
@@ -111,18 +111,18 @@ grele-13:
     version: E5-2650 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed730020f1032d04bb5a42"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed730020f1032e04caaa9d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
+      id: disk1
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
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 9c28338a1f0..e2ae416a316 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-14.yaml
@@ -111,18 +111,18 @@ grele-14:
     version: E5-2650 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed690020f1032d04b81a70"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed690020f1032d04c25600"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
+      id: disk1
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
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 c42847c06ef..fd45e83ea39 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-2.yaml
@@ -111,18 +111,18 @@ grele-2:
     version: E5-2650 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed2a0020f1032a048f9578"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed2a0020f1032b049a2ad8"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
+      id: disk1
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
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 1f986a963fe..3450409ff15 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-3.yaml
@@ -111,18 +111,18 @@ grele-3:
     version: E5-2650 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed6f0020f1032c04bd15c6"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed6f0020f1032d04cc530a"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
+      id: disk1
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
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 9fda9ffeb5a..f1df3418907 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-4.yaml
@@ -111,18 +111,18 @@ grele-4:
     version: E5-2650 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b71d5f0020f1032d04be1041"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b71d5f0020f1032e04c8712e"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
+      id: disk1
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
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 7902812d952..232f31665e0 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-5.yaml
@@ -111,18 +111,18 @@ grele-5:
     version: E5-2650 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b71d4d0020f1032c04b8def7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b71d4d0020f1032d04c354fb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
+      id: disk1
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
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 5ca5a9931f3..a351ccd46ad 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-6.yaml
@@ -111,18 +111,18 @@ grele-6:
     version: E5-2650 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b71d450020f1032c04bdd746"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b71d450020f1032d04c8387e"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
+      id: disk1
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
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 a21f1a58e97..3b535c499db 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-7.yaml
@@ -111,18 +111,18 @@ grele-7:
     version: E5-2650 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed4a0020f1032d04c19f7c"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed4a0020f1032e04cc2521"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
+      id: disk1
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
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 f1796f863d1..cc5bbd0fdfc 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-8.yaml
@@ -111,18 +111,18 @@ grele-8:
     version: E5-2650 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5edaa0020f1032d04c034d0"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5edaa0020f1032e04ca950d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
+      id: disk1
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
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 095cfe9664a..628bf97b00f 100644
--- a/input/grid5000/sites/nancy/clusters/grele/nodes/grele-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grele/nodes/grele-9.yaml
@@ -111,18 +111,18 @@ grele-9:
     version: E5-2650 v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed6d0020f1032d04c3c44f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x61866da0b5ed6d0020f1032d04ce0efe"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:2:1:0"
       firmware_version: 4.3
+      id: disk1
       model: PERC H730 Mini
       size: 299439751168
       storage: HDD
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 c0991a0a264..ad7c9d6afe9 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.yaml
@@ -111,10 +111,10 @@ grimani-1:
     version: E5-2603 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008cd09959"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: NA07
+      id: disk0
       model: ST1000NX0423
       size: 1000204886016
       storage: HDD
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 ab84da8a90b..68987067ff5 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.yaml
@@ -111,10 +111,10 @@ grimani-2:
     version: E5-2603 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008cd09a85"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: NA07
+      id: disk0
       model: ST1000NX0423
       size: 1000204886016
       storage: HDD
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 edbebbe9a6a..905f19a6b73 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.yaml
@@ -111,10 +111,10 @@ grimani-3:
     version: E5-2603 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008cd099ab"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: NA07
+      id: disk0
       model: ST1000NX0423
       size: 1000204886016
       storage: HDD
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 6c7650cf133..0a862e1d61c 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.yaml
@@ -111,10 +111,10 @@ grimani-4:
     version: E5-2603 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008cd0b9ae"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: NA07
+      id: disk0
       model: ST1000NX0423
       size: 1000204886016
       storage: HDD
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 e8289798d88..2758eeb5208 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.yaml
@@ -111,10 +111,10 @@ grimani-5:
     version: E5-2603 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008cd0bade"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: NA07
+      id: disk0
       model: ST1000NX0423
       size: 1000204886016
       storage: HDD
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 fef93b23fb6..eb8f72d919c 100644
--- a/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.yaml
@@ -111,10 +111,10 @@ grimani-6:
     version: E5-2603 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008cd0b091"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: NA07
+      id: disk0
       model: ST1000NX0423
       size: 1000204886016
       storage: HDD
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 8bad160579d..eaaadb2de34 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.yaml
@@ -115,50 +115,50 @@ grimoire-1:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e514393"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f9ad7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f9eb3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: TT31
+      id: disk2
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f88af"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: TT31
+      id: disk3
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50d4df"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: TT31
+      id: disk4
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa2d4"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 87e6d2ece55..08a53a1db76 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.yaml
@@ -115,50 +115,50 @@ grimoire-2:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e501987"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fd00f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f92df"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: TT31
+      id: disk2
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f948f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: TT31
+      id: disk3
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f9127"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: TT31
+      id: disk4
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa2d0"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 dfce70abf94..b911ed584af 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.yaml
@@ -115,50 +115,50 @@ grimoire-3:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e514093"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513acb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50d657"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: TT31
+      id: disk2
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513eb3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: TT31
+      id: disk3
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513b07"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: TT31
+      id: disk4
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa284"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 3554fe690ea..a8b20297706 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.yaml
@@ -115,50 +115,50 @@ grimoire-4:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513a33"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5261db"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50dd57"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: TT31
+      id: disk2
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e500297"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: TT31
+      id: disk3
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5013af"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: TT31
+      id: disk4
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa634"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 5673b33dfd3..c074c30fd0c 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.yaml
@@ -115,50 +115,50 @@ grimoire-5:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50fa3b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510f7b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50ea43"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: TT31
+      id: disk2
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51440b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: TT31
+      id: disk3
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51465f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: TT31
+      id: disk4
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa61c"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 28256179129..b489515bdb8 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.yaml
@@ -115,50 +115,50 @@ grimoire-6:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f8dff"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f920f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f9bf3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: TT31
+      id: disk2
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f99c3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: TT31
+      id: disk3
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fa8ff"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: TT31
+      id: disk4
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa2b0"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 c7a518ec7de..c5255b3a289 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.yaml
@@ -115,50 +115,50 @@ grimoire-7:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50da03"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50cd8f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e501393"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: TT31
+      id: disk2
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50d4fb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: TT31
+      id: disk3
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e501a77"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: TT31
+      id: disk4
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa608"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 0854d7e76ec..a5d1b502082 100644
--- a/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.yaml
@@ -115,50 +115,50 @@ grimoire-8:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e509233"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f8777"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fcff7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: TT31
+      id: disk2
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51004b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: TT31
+      id: disk3
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4f9f5f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: TT31
+      id: disk4
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x500003967c8aa65c"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 df5cfa07fd0..57c08f026b4 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.yaml
@@ -104,18 +104,18 @@ grisou-1:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513d3b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510fe7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 042be8720da..d5dfd9ab7ca 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.yaml
@@ -104,18 +104,18 @@ grisou-10:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e514a3b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5145c3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 3eec2ce1e4e..bd9ae942f64 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.yaml
@@ -104,18 +104,18 @@ grisou-11:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50ee8b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e514357"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 1c90b83c99c..fa50eef7d5b 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.yaml
@@ -104,18 +104,18 @@ grisou-12:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513917"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51467f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 6f0cd16fd11..2faa42f5027 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.yaml
@@ -104,18 +104,18 @@ grisou-13:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50fe8f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50fdd3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 359798c74d8..e9a51e961b1 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.yaml
@@ -104,18 +104,18 @@ grisou-14:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e43ac97"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4ff643"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 27c46d2dd61..e5618af8aa3 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.yaml
@@ -104,18 +104,18 @@ grisou-15:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e43beaf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4facaf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 0844ebaebca..1f34d40067c 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.yaml
@@ -104,18 +104,18 @@ grisou-16:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513ddb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5135bb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 6c16283a54b..f11e154cdb7 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.yaml
@@ -104,18 +104,18 @@ grisou-17:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5113d7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510877"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 79a6a31a21c..cfb77583ae9 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.yaml
@@ -104,18 +104,18 @@ grisou-18:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5132cb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51125f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 9940b495aba..d808b087a2a 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.yaml
@@ -104,18 +104,18 @@ grisou-19:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50df07"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5116e3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 ed2c13e480c..efdf7c2166e 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.yaml
@@ -104,18 +104,18 @@ grisou-2:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51428b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510857"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 b218181633c..a1ee72f60ba 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.yaml
@@ -104,18 +104,18 @@ grisou-20:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51448f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50dbdb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 32cd418bd95..7466ad58dc4 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.yaml
@@ -104,18 +104,18 @@ grisou-21:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5145eb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e511057"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 ed64ee64c73..0066d60a8c4 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.yaml
@@ -104,18 +104,18 @@ grisou-22:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5141b3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51199b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 671cc327890..9a3c8f1bb27 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.yaml
@@ -104,18 +104,18 @@ grisou-23:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e43b8a3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e43c0ef"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 d194a87d14e..722334c600f 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.yaml
@@ -104,18 +104,18 @@ grisou-24:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e439c87"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4ff27f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 0528f283c87..585e950fa12 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.yaml
@@ -104,18 +104,18 @@ grisou-25:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50280f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e473563"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 9b25b07b919..2caf9c3ce78 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.yaml
@@ -104,18 +104,18 @@ grisou-26:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e47b26f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50105b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 30ff3619944..df77c4f55bf 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.yaml
@@ -104,18 +104,18 @@ grisou-27:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5027bf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50198f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 d251492f7f6..febae2e28f6 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.yaml
@@ -104,18 +104,18 @@ grisou-28:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e502353"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5014e7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 0105c053fff..022ab3c5ea2 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.yaml
@@ -104,18 +104,18 @@ grisou-29:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5015cf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50163f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 c45908f205d..a0c2765ac16 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.yaml
@@ -104,18 +104,18 @@ grisou-3:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e511757"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513487"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 1ec3b2df5cf..4218bb81fe6 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.yaml
@@ -104,18 +104,18 @@ grisou-30:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e52618f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e522faf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 c77ddc96282..d312c09d0a4 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.yaml
@@ -104,18 +104,18 @@ grisou-31:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e41a743"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4ffa5b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 75162902f5b..73098e21d44 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.yaml
@@ -104,18 +104,18 @@ grisou-32:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50e527"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e43bdd3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 8046cb30d61..06358a5ac2c 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.yaml
@@ -104,18 +104,18 @@ grisou-33:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4ff507"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513b77"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 9b16e32e457..ffa1070c49d 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.yaml
@@ -104,18 +104,18 @@ grisou-34:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e501663"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50129b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 7c1ed19f3f5..1c0cfe690f9 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.yaml
@@ -104,18 +104,18 @@ grisou-35:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e525903"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50d963"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 a432559bfe4..cc164407c38 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.yaml
@@ -104,18 +104,18 @@ grisou-36:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5147fb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51061b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 fbe8416ddc4..1ccaa7022f4 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.yaml
@@ -104,18 +104,18 @@ grisou-37:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513c57"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51395b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 ad30b201720..6c302ea5c03 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.yaml
@@ -104,18 +104,18 @@ grisou-38:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510f0f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5105bb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 56b0e0d3ea0..2f465a3b3ce 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.yaml
@@ -104,18 +104,18 @@ grisou-39:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513c87"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50e667"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 705fe0aaeaa..2d173d97aca 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.yaml
@@ -104,18 +104,18 @@ grisou-4:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e514363"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510bff"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 b05dc176f43..1c0e1f703a2 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.yaml
@@ -104,18 +104,18 @@ grisou-40:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510833"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513bcb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 3ddb43bb2d1..644a2f28b2a 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.yaml
@@ -104,18 +104,18 @@ grisou-41:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fc7eb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50fcab"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 f40d0b1fce9..ec9396942de 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.yaml
@@ -104,18 +104,18 @@ grisou-42:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e44d1b7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5147bf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 6c9d4804ac3..3e29eec6826 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.yaml
@@ -104,18 +104,18 @@ grisou-43:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5106e7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5110db"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 7d797a32256..6daf2f003c9 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.yaml
@@ -104,18 +104,18 @@ grisou-44:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51423b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51113f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 9873f02f0fe..0d7295c1144 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.yaml
@@ -104,18 +104,18 @@ grisou-45:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50fcbb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513663"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 37edc82c499..7b260cee91d 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.yaml
@@ -104,18 +104,18 @@ grisou-46:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50d49f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e501c8f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 6444a9ac85d..f9710618f02 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.yaml
@@ -104,18 +104,18 @@ grisou-47:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e43bedb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5012b7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 5af426438a6..c80d0b72c0e 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.yaml
@@ -104,18 +104,18 @@ grisou-48:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e41e64b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50d16f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 9b36bfa9242..601b38c645f 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.yaml
@@ -103,18 +103,18 @@ grisou-49:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e43b94b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4396e7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 3c1876eaa89..bcd20971260 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.yaml
@@ -104,18 +104,18 @@ grisou-5:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4ff45f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510b1b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 418c576041e..6bcc5c5f49c 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.yaml
@@ -115,18 +115,18 @@ grisou-50:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50e807"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e513b17"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 3edcf04477a..fb90be2bdf2 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.yaml
@@ -115,18 +115,18 @@ grisou-51:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50db87"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e4fcd27"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 b4de5041d90..b6fd9b3dc21 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.yaml
@@ -104,18 +104,18 @@ grisou-6:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50f8a7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50dc67"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 915ff512ba7..3ce885dd5e2 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.yaml
@@ -104,18 +104,18 @@ grisou-7:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50eb33"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510f57"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 205d71ecb47..cee1ba8f75f 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.yaml
@@ -104,18 +104,18 @@ grisou-8:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e50fa93"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e510883"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 524bd19b2d6..40f27796d78 100644
--- a/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.yaml
@@ -104,18 +104,18 @@ grisou-9:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e5107b7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: TT31
+      id: disk0
       model: ST600MM0088
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5008e51017f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: TT31
+      id: disk1
       model: ST600MM0088
       size: 600127266816
       storage: HDD
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 5b9006c3d01..05fecb4668f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-1.yaml
@@ -65,18 +65,18 @@ gros-1:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45cda"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 06dc3062ade..26c022c619d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-10.yaml
@@ -65,18 +65,18 @@ gros-10:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e49072"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 c22c62a3066..118e3e4c2b2 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-100.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-100.yaml
@@ -65,18 +65,18 @@ gros-100:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9dca"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 b75130974e2..d34c59c6dd8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-101.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-101.yaml
@@ -65,18 +65,18 @@ gros-101:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9e4e"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 4667eb61ad1..cb6eea2754d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-102.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-102.yaml
@@ -65,18 +65,18 @@ gros-102:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45e37"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 d53b58915d2..6c0eaf0c024 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-103.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-103.yaml
@@ -65,18 +65,18 @@ gros-103:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45de9"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 345268a4dfe..a54995e2892 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-104.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-104.yaml
@@ -65,18 +65,18 @@ gros-104:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45d12"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 823beec7f0f..e6dc5b75019 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-105.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-105.yaml
@@ -65,18 +65,18 @@ gros-105:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbabec"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 0e61f8a3989..ccd91597d81 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-106.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-106.yaml
@@ -65,18 +65,18 @@ gros-106:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9da5"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 b3b980db688..060be626584 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-107.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-107.yaml
@@ -65,18 +65,18 @@ gros-107:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbac5c"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 408aee6abdf..be14a3bdc22 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-108.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-108.yaml
@@ -65,18 +65,18 @@ gros-108:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45d27"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 59cc6bed9d7..8ad6660df8f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-109.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-109.yaml
@@ -65,18 +65,18 @@ gros-109:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba682"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 14eb2e3ecc1..35c4e2d1b96 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-11.yaml
@@ -65,18 +65,18 @@ gros-11:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45c17"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 197b1ab5802..5857df30abc 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-110.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-110.yaml
@@ -65,18 +65,18 @@ gros-110:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba6c8"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 a11644845ee..32be37a37a0 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-111.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-111.yaml
@@ -65,18 +65,18 @@ gros-111:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba8c4"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 473be0446b8..77abf8fe3be 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-112.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-112.yaml
@@ -65,18 +65,18 @@ gros-112:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba687"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 45af6bfd6a5..67c6df3301a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-113.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-113.yaml
@@ -65,18 +65,18 @@ gros-113:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba8b5"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 caea89adfa5..ca07f80a681 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-114.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-114.yaml
@@ -65,18 +65,18 @@ gros-114:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e48123"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 9e14cd90e26..4d139a17056 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-115.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-115.yaml
@@ -65,18 +65,18 @@ gros-115:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e4a7f1"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 adc138f8397..e82a3334466 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-116.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-116.yaml
@@ -65,18 +65,18 @@ gros-116:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e4a864"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 79b4250026a..3c323011d76 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-117.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-117.yaml
@@ -65,18 +65,18 @@ gros-117:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb4d1"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 ca0dd6ae8ba..b0579ca88ea 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-118.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-118.yaml
@@ -65,18 +65,18 @@ gros-118:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb421"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 7ff046be211..5b04e3d8320 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-119.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-119.yaml
@@ -65,18 +65,18 @@ gros-119:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb4f8"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 d9a0953de04..52847249bf5 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-12.yaml
@@ -65,18 +65,18 @@ gros-12:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e4911b"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 4c072f06418..33278ab8801 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-120.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-120.yaml
@@ -65,18 +65,18 @@ gros-120:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb3d9"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 f3d54e90f66..fa679882e9f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-121.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-121.yaml
@@ -65,18 +65,18 @@ gros-121:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb48f"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 5b1d5bceaea..08e7ace86fd 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-122.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-122.yaml
@@ -65,18 +65,18 @@ gros-122:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb408"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 eaa7c61eadd..f0e27de2299 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-123.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-123.yaml
@@ -65,18 +65,18 @@ gros-123:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb490"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 de2c0aad6c5..42e9ac83ccd 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-124.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-124.yaml
@@ -65,18 +65,18 @@ gros-124:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb593"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 d4e7c3f2474..a27f4b11f4a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-13.yaml
@@ -65,18 +65,18 @@ gros-13:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e4935f"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 c6f6f14a447..baa95088dfc 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-14.yaml
@@ -65,18 +65,18 @@ gros-14:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e492a0"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 4ce4bd887a3..97d712a7bdb 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-15.yaml
@@ -65,18 +65,18 @@ gros-15:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e49116"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 e9866e999eb..ad72cab19bc 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-16.yaml
@@ -65,18 +65,18 @@ gros-16:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9d1f"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 79d26c6c8e8..129a9c499e4 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-17.yaml
@@ -65,18 +65,18 @@ gros-17:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9d0d"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 e93072270fc..692313ba4a8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-18.yaml
@@ -65,18 +65,18 @@ gros-18:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9c9a"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 36f5e966a64..b57c4057598 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-19.yaml
@@ -65,18 +65,18 @@ gros-19:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9c8f"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 5a64a70a352..3bd20610950 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-2.yaml
@@ -65,18 +65,18 @@ gros-2:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45b85"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 bd89b129150..4007a382448 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-20.yaml
@@ -65,18 +65,18 @@ gros-20:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9cb4"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 9150e70bcc0..a8406c9a358 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-21.yaml
@@ -65,18 +65,18 @@ gros-21:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9288"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 19842cc1b8f..26413be49f3 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-22.yaml
@@ -65,18 +65,18 @@ gros-22:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb5a6"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 9726dd3313b..776606ec94d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-23.yaml
@@ -65,18 +65,18 @@ gros-23:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e48164"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 e9e73d080ab..7329c32bfd7 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-24.yaml
@@ -65,18 +65,18 @@ gros-24:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb4e9"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 a28fba98ca4..699644feeb2 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-25.yaml
@@ -65,18 +65,18 @@ gros-25:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb21c"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 5b359e4db20..dbbc447092b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-26.yaml
@@ -65,18 +65,18 @@ gros-26:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db949b"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 4510cee2600..6f0121b5b4f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-27.yaml
@@ -65,18 +65,18 @@ gros-27:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db945e"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 968be0e7f03..40cc0fff26c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-28.yaml
@@ -65,18 +65,18 @@ gros-28:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9436"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 7ba2969a3b1..ceec6bc575c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-29.yaml
@@ -65,18 +65,18 @@ gros-29:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db94a0"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 ea41f1df5b1..977b885f4b7 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-3.yaml
@@ -65,18 +65,18 @@ gros-3:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e481b7"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 a4a27bb8098..89af02fce3c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-30.yaml
@@ -65,18 +65,18 @@ gros-30:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db92d9"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 d8e9938ce80..6e5224b8ddd 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-31.yaml
@@ -65,18 +65,18 @@ gros-31:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba6af"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 01dc3774da3..bc62937e5eb 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-32.yaml
@@ -65,18 +65,18 @@ gros-32:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba956"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 b07b648ee13..885aa9a4ddc 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-33.yaml
@@ -65,18 +65,18 @@ gros-33:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9e60"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 d3bb0daf806..b7f04f794c8 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-34.yaml
@@ -65,18 +65,18 @@ gros-34:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9e46"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 e57bddc82b3..18d0f991680 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-35.yaml
@@ -65,18 +65,18 @@ gros-35:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9da3"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 b29dac0214a..6cb80dfaffa 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-36.yaml
@@ -65,18 +65,18 @@ gros-36:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9dc2"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 db8fa9039d0..cada5d90fc5 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-37.yaml
@@ -65,18 +65,18 @@ gros-37:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbac1f"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 1a412c6dab8..d6ac5b68358 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-38.yaml
@@ -65,18 +65,18 @@ gros-38:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45c34"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 2771b705543..05146afef66 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-39.yaml
@@ -65,18 +65,18 @@ gros-39:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba675"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 be979c6cb82..b316306f8f6 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-4.yaml
@@ -65,18 +65,18 @@ gros-4:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb422"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 e8b098afd0b..cb76336bca9 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-40.yaml
@@ -65,18 +65,18 @@ gros-40:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb474"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 4110a10da2b..5f53ab3c180 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-41.yaml
@@ -65,18 +65,18 @@ gros-41:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9e8e"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 18324769cef..e7cea77f662 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-42.yaml
@@ -65,18 +65,18 @@ gros-42:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba006"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 609cdd0fed3..e25fe608ed9 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-43.yaml
@@ -65,18 +65,18 @@ gros-43:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45cae"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 4da9bb43c54..b84850bfa70 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-44.yaml
@@ -65,18 +65,18 @@ gros-44:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45b7f"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 5b0ed88fbac..8f9f1f5d664 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-45.yaml
@@ -65,18 +65,18 @@ gros-45:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e49090"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 bf1b7e828bb..f72ee06baaa 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-46.yaml
@@ -65,18 +65,18 @@ gros-46:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e48eee"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 6143bb37995..261d2d18d87 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-47.yaml
@@ -65,18 +65,18 @@ gros-47:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbabf1"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 d3c1b05fa0f..ac16b1be980 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-48.yaml
@@ -65,18 +65,18 @@ gros-48:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e48ed2"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 ba52191ddd4..d89449f94eb 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-49.yaml
@@ -65,18 +65,18 @@ gros-49:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45c16"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 28eee5c7b90..6ffa34dba67 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-5.yaml
@@ -65,18 +65,18 @@ gros-5:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e481ec"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 98b5a067b92..3ae1a2d95f3 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-50.yaml
@@ -65,18 +65,18 @@ gros-50:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e491ca"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 0840c797d94..af83107720f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-51.yaml
@@ -65,18 +65,18 @@ gros-51:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e4919e"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 5dd940c5c95..ea5d5cff11a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-52.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-52.yaml
@@ -65,18 +65,18 @@ gros-52:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba8ba"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 ccaecc3d044..5abfef91c7c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-53.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-53.yaml
@@ -65,18 +65,18 @@ gros-53:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba6dd"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 63ff1d4804d..b8cb1871eac 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-54.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-54.yaml
@@ -65,18 +65,18 @@ gros-54:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba8a5"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 c30813536a9..f7659cecc5a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-55.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-55.yaml
@@ -65,18 +65,18 @@ gros-55:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e490ce"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 d29a9b8858d..80a55869413 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-56.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-56.yaml
@@ -65,18 +65,18 @@ gros-56:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb4b3"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 48fd49e2eba..0100a027787 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-57.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-57.yaml
@@ -65,18 +65,18 @@ gros-57:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb5df"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 43f93e6a6cc..c16eef110d4 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-58.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-58.yaml
@@ -65,18 +65,18 @@ gros-58:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba5cd"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 842e4a42311..c9bfd3483b4 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-59.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-59.yaml
@@ -65,18 +65,18 @@ gros-59:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e48ee6"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 d1968f53004..308efbeffb9 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-6.yaml
@@ -65,18 +65,18 @@ gros-6:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e4a646"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 9c8b919f983..655a1c8cf9c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-60.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-60.yaml
@@ -65,18 +65,18 @@ gros-60:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb29b"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 493ed93b866..a471cac5b91 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-61.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-61.yaml
@@ -65,18 +65,18 @@ gros-61:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9d8b"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 a718aa0d8c9..ce1961a4bde 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-62.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-62.yaml
@@ -65,18 +65,18 @@ gros-62:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbac58"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 dce8c9100d3..7d74db55258 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-63.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-63.yaml
@@ -65,18 +65,18 @@ gros-63:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbabcd"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 b43869e90aa..5acc1e1bc40 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-64.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-64.yaml
@@ -65,18 +65,18 @@ gros-64:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e49251"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 da6d4431428..086bbadc719 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-65.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-65.yaml
@@ -65,18 +65,18 @@ gros-65:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e4911c"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 dd4ecc01365..4533fec4011 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-66.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-66.yaml
@@ -65,18 +65,18 @@ gros-66:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e49287"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 d7221947ac4..b0714bc8785 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-67.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-67.yaml
@@ -65,18 +65,18 @@ gros-67:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e491a4"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 7c84b9a76bd..1855160b973 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-68.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-68.yaml
@@ -65,18 +65,18 @@ gros-68:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45cb8"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: SSDSC2KG960G8R
       size: 960197124096
       storage: SSD
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 6e8b073298b..53d41a9ad9a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-69.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-69.yaml
@@ -65,18 +65,18 @@ gros-69:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbac5d"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 ce742003bf2..70862b18e6d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-7.yaml
@@ -65,18 +65,18 @@ gros-7:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e490db"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 7e82322f27e..4d8e6c78ef1 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-70.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-70.yaml
@@ -65,18 +65,18 @@ gros-70:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbac20"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 62370cbb9e2..b31b22b53bc 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-71.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-71.yaml
@@ -65,18 +65,18 @@ gros-71:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbac8a"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 3e11fca0905..82424d2f37f 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-72.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-72.yaml
@@ -65,18 +65,18 @@ gros-72:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbac70"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 2bc03f692cc..cda0e655d74 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-73.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-73.yaml
@@ -65,18 +65,18 @@ gros-73:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45e41"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 20e594c14fc..00f53cbaa3b 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-74.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-74.yaml
@@ -65,18 +65,18 @@ gros-74:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45c05"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 460be62e02c..a6c27f857dd 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-75.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-75.yaml
@@ -65,18 +65,18 @@ gros-75:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e49281"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 702bb59e485..15bdbd1f9b5 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-76.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-76.yaml
@@ -65,18 +65,18 @@ gros-76:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e48eb0"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 7c5062e956c..f5ded0d64c0 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-77.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-77.yaml
@@ -65,18 +65,18 @@ gros-77:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9f9d"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 a298a43035e..1ce55ca69c1 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-78.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-78.yaml
@@ -65,18 +65,18 @@ gros-78:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba004"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 f83ba4c2a8d..bbb1f3dc36d 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-79.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-79.yaml
@@ -65,18 +65,18 @@ gros-79:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9e86"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 9592691f81d..d2b64a7b925 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-8.yaml
@@ -65,18 +65,18 @@ gros-8:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e49145"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 9f541c82e9d..d35dee25493 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-80.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-80.yaml
@@ -65,18 +65,18 @@ gros-80:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9eba"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 8dd1611471a..55b4830f5a7 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-81.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-81.yaml
@@ -65,18 +65,18 @@ gros-81:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9e8a"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 da6dd26e4cb..28c1a78c6b3 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-82.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-82.yaml
@@ -65,18 +65,18 @@ gros-82:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dba022"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 b895526a7d6..8a08afd1973 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-83.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-83.yaml
@@ -65,18 +65,18 @@ gros-83:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45df1"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 8bba053de69..9cd61d23db2 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-84.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-84.yaml
@@ -65,18 +65,18 @@ gros-84:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45de2"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 9245ba48468..92c7e7bcae5 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-85.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-85.yaml
@@ -65,18 +65,18 @@ gros-85:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e481ff"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 3e1798654a2..03acc8fe5a4 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-86.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-86.yaml
@@ -65,18 +65,18 @@ gros-86:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbb47f"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 385fc4fc440..da37e0ba979 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-87.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-87.yaml
@@ -65,18 +65,18 @@ gros-87:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e4a892"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 27cebe9f6a8..013e4ce669c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-88.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-88.yaml
@@ -65,18 +65,18 @@ gros-88:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e4814a"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 b519dc4816d..f28b45e3d47 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-89.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-89.yaml
@@ -65,18 +65,18 @@ gros-89:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9c58"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 e7b70ae95c3..76282325064 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-9.yaml
@@ -65,18 +65,18 @@ gros-9:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9d8a"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 f157462eb76..045609d5796 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-90.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-90.yaml
@@ -65,18 +65,18 @@ gros-90:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9d0e"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 9107c9bcd26..184137d7707 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-91.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-91.yaml
@@ -65,18 +65,18 @@ gros-91:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9cb5"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 2e70a76d3a9..f6155b1f569 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-92.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-92.yaml
@@ -65,18 +65,18 @@ gros-92:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45e15"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 85ef02ad295..b49076f353a 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-93.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-93.yaml
@@ -65,18 +65,18 @@ gros-93:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45de1"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 0c6f2d0e863..5b7190fdd37 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-94.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-94.yaml
@@ -65,18 +65,18 @@ gros-94:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45b44"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 aee42d7be21..077389a9c30 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-95.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-95.yaml
@@ -65,18 +65,18 @@ gros-95:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9d92"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 c9d518d5496..fb44e27870c 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-96.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-96.yaml
@@ -65,18 +65,18 @@ gros-96:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9cef"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 e89ab349f55..1ddd44d93f0 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-97.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-97.yaml
@@ -65,18 +65,18 @@ gros-97:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121db9c21"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 210d0aaf923..1e815325ec7 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-98.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-98.yaml
@@ -65,18 +65,18 @@ gros-98:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121e45d26"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       storage: SSD
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 92e4dfeb65e..0b82c8ba097 100644
--- a/input/grid5000/sites/nancy/clusters/gros/nodes/gros-99.yaml
+++ b/input/grid5000/sites/nancy/clusters/gros/nodes/gros-99.yaml
@@ -65,18 +65,18 @@ gros-99:
     version: Gold 5220
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x500a075121dbac66"
       by_path: "/dev/disk/by-path/pci-0000:17:00.0-scsi-0:0:0:0"
       firmware_version: D1DF003
+      id: disk0
       model: MTFDDAK480TDN
       size: 480103981056
       storage: SSD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: MTFDDAK960TDN
       size: 960197124096
       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 156a83ac019..7ee760b0284 100644
--- a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-1.yaml
@@ -99,18 +99,18 @@ grouille-1:
     version: 7452
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x58ce38ee20f6cc95"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:1:0"
       firmware_version: B709
+      id: disk0
       model: KRM5XVUG1T92
       size: 1920383410176
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075129de049a"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:2:0"
       firmware_version: D3DJ004
+      id: disk1
       model: MTFDDAK960TDT
       size: 960197124096
       storage: SSD
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 5f44c714cc2..034cf2f4c92 100644
--- a/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grouille/nodes/grouille-2.yaml
@@ -99,18 +99,18 @@ grouille-2:
     version: 7452
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x58ce38ee20f6cc9d"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:1:0"
       firmware_version: B709
+      id: disk0
       model: KRM5XVUG1T92
       size: 1920383410176
       storage: SSD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x500a075129de046c"
       by_path: "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:2:0"
       firmware_version: D3DJ004
+      id: disk1
       model: MTFDDAK960TDT
       size: 960197124096
       storage: SSD
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 9470fc55348..fc5cc25715c 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-1.yaml
@@ -115,10 +115,10 @@ grue-1:
     version: 7351
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x64cd98f09f8c1d002577fac20390a63a"
       by_path: "/dev/disk/by-path/pci-0000:e1:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H730P Adp
       size: 479559942144
       storage: HDD
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 94b8d24c4e6..19d13fcf02c 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-2.yaml
@@ -115,10 +115,10 @@ grue-2:
     version: 7351
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x64cd98f09f5a72002577fabc03912e15"
       by_path: "/dev/disk/by-path/pci-0000:e1:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H730P Adp
       size: 479559942144
       storage: HDD
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 42e799366a7..d174cd5b838 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-3.yaml
@@ -115,10 +115,10 @@ grue-3:
     version: 7351
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x64cd98f09f5a86002577fabf03952f56"
       by_path: "/dev/disk/by-path/pci-0000:e1:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H730P Adp
       size: 479559942144
       storage: HDD
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 f2b6d474e86..e7614521e7f 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-4.yaml
@@ -115,10 +115,10 @@ grue-4:
     version: 7351
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x64cd98f09f8c1f002577fac703934f94"
       by_path: "/dev/disk/by-path/pci-0000:e1:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H730P Adp
       size: 479559942144
       storage: HDD
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 1340d9c34ce..cd42555965e 100644
--- a/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grue/nodes/grue-5.yaml
@@ -115,10 +115,10 @@ grue-5:
     version: 7351
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x64cd98f09f8c0d002577face0399668f"
       by_path: "/dev/disk/by-path/pci-0000:e1:00.0-scsi-0:2:0:0"
       firmware_version: 4.3
+      id: disk0
       model: PERC H730P Adp
       size: 479559942144
       storage: HDD
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 67243b8b32a..60d66d53e70 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-1.yaml
@@ -76,10 +76,10 @@ grvingt-1:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b93315ab"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 16f5d8a74dc..583b0ef72f2 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-10.yaml
@@ -76,10 +76,10 @@ grvingt-10:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915da70"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 5c85291027a..0be8b20e4c8 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-11.yaml
@@ -76,10 +76,10 @@ grvingt-11:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b9157be1"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 c41bfb0c2b5..37a84eca667 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-12.yaml
@@ -76,10 +76,10 @@ grvingt-12:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b93364de"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 fb3e040e9cb..62dc801eb79 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-13.yaml
@@ -76,10 +76,10 @@ grvingt-13:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b932ed31"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 415646201f5..c8d596c2201 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-14.yaml
@@ -76,10 +76,10 @@ grvingt-14:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b9334573"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 768851e903b..be7a6b93823 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-15.yaml
@@ -76,10 +76,10 @@ grvingt-15:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b9334d12"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 c74f549c81a..9309a68f171 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-16.yaml
@@ -76,10 +76,10 @@ grvingt-16:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b93366e8"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 28cbdcc77e5..71b4ac164ef 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-17.yaml
@@ -76,10 +76,10 @@ grvingt-17:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915e6a6"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 3e3a638ab3e..512ecb5e0b0 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-18.yaml
@@ -76,10 +76,10 @@ grvingt-18:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915c58f"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 bac18dd736b..bdf2f42e6fc 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-19.yaml
@@ -76,10 +76,10 @@ grvingt-19:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b9154683"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 16e9d523ab7..0a0690b9e91 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-2.yaml
@@ -76,10 +76,10 @@ grvingt-2:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b932f2bc"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 c75cd0fcfbf..25c034ebb55 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-20.yaml
@@ -76,10 +76,10 @@ grvingt-20:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b9168163"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 001c319a849..ce013780dda 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-21.yaml
@@ -76,10 +76,10 @@ grvingt-21:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91bacba"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 3d0e9035f0a..328c2a93317 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-22.yaml
@@ -76,10 +76,10 @@ grvingt-22:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91b74f6"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 26f0a4ae0e3..7d339af373a 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-23.yaml
@@ -76,10 +76,10 @@ grvingt-23:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91bb032"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 848891a7982..ffadc28eb70 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-24.yaml
@@ -76,10 +76,10 @@ grvingt-24:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91ba0ef"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 f33d062fd5c..22c5959aaca 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-25.yaml
@@ -76,10 +76,10 @@ grvingt-25:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500ad6ddd6d"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 ccadf2d6670..7577ed1be45 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-26.yaml
@@ -76,10 +76,10 @@ grvingt-26:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b93360b0"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 e3837e07a91..0d6857083fd 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-27.yaml
@@ -76,10 +76,10 @@ grvingt-27:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500ad6df578"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 fbaff4ca943..68803caa73e 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-28.yaml
@@ -76,10 +76,10 @@ grvingt-28:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915c705"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 05ee72e2534..9f49c26e8be 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-29.yaml
@@ -76,10 +76,10 @@ grvingt-29:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915c294"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 5ca2650f398..ae770bd667f 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-3.yaml
@@ -76,10 +76,10 @@ grvingt-3:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b93364a7"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 75843198f9c..b6abbf337f7 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-30.yaml
@@ -76,10 +76,10 @@ grvingt-30:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915d8cc"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 09b0ef8736f..adfd7606c5e 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-31.yaml
@@ -76,10 +76,10 @@ grvingt-31:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b9156789"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 78b3fb7af63..82ac535bb28 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-32.yaml
@@ -76,10 +76,10 @@ grvingt-32:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915f70a"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 0a089a5808a..ac053db94ca 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-33.yaml
@@ -76,10 +76,10 @@ grvingt-33:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b9158fb9"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 4d93176e1e2..1709bb2494e 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-34.yaml
@@ -76,10 +76,10 @@ grvingt-34:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b916b217"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 cc8352b5a55..f444a76fbf7 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-35.yaml
@@ -76,10 +76,10 @@ grvingt-35:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91682e0"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 6a30f75f8dc..0ebf80a78a3 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-36.yaml
@@ -76,10 +76,10 @@ grvingt-36:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500ad6241c4"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 15f9f628c4a..bcc7778501f 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-37.yaml
@@ -76,10 +76,10 @@ grvingt-37:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915c045"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 74459b5f7c1..b7025d2f488 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-38.yaml
@@ -76,10 +76,10 @@ grvingt-38:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b9157c19"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 1482dddf8dc..0a4fc9bee57 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-39.yaml
@@ -76,10 +76,10 @@ grvingt-39:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91568d0"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 be3eae60a0f..6b4dc86b0cf 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-4.yaml
@@ -76,10 +76,10 @@ grvingt-4:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b93325e8"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 36c37085ea1..deca6ec67d3 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-40.yaml
@@ -76,10 +76,10 @@ grvingt-40:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915d1e5"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 65be16e7082..9a00ba8078c 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-41.yaml
@@ -76,10 +76,10 @@ grvingt-41:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91b8973"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 6f5d9ff2599..289a5054c0b 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-42.yaml
@@ -76,10 +76,10 @@ grvingt-42:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91da350"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 25d66295c45..58cea358b52 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-43.yaml
@@ -76,10 +76,10 @@ grvingt-43:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91bae6d"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 a2bab55ae55..eb4e2924512 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-44.yaml
@@ -76,10 +76,10 @@ grvingt-44:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91ba636"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 33c5c007fd6..867e8f8ebb1 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-45.yaml
@@ -76,10 +76,10 @@ grvingt-45:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91671e7"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 0414b4bc1c4..b335a8eec5c 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-46.yaml
@@ -76,10 +76,10 @@ grvingt-46:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b9156f5b"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 e84bb5cbfb4..59c7b7070e6 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-47.yaml
@@ -76,10 +76,10 @@ grvingt-47:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b9157a5a"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 aa98d465ab1..ce908c21eb7 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-48.yaml
@@ -76,10 +76,10 @@ grvingt-48:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500ad6e229f"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 ea2a62e1ca0..ec0d62be87e 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-49.yaml
@@ -76,10 +76,10 @@ grvingt-49:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91bad73"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 ee53feae6e1..ed371197275 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-5.yaml
@@ -76,10 +76,10 @@ grvingt-5:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91bb1ed"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 2154fbb48b8..71b09fdc04c 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-50.yaml
@@ -76,10 +76,10 @@ grvingt-50:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91badab"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 59a900fdbb9..b3373ebc991 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-51.yaml
@@ -76,10 +76,10 @@ grvingt-51:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915d9cb"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 4ece96247a7..38913097790 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-52.yaml
@@ -76,10 +76,10 @@ grvingt-52:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915c316"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 ee2bf1a3c2a..9d31692d017 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-53.yaml
@@ -76,10 +76,10 @@ grvingt-53:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500ad6e404d"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 919a650dfa4..0edc30adf24 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-54.yaml
@@ -76,10 +76,10 @@ grvingt-54:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500ad6e09e7"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 6469c741657..1254bd7bdb0 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-55.yaml
@@ -76,10 +76,10 @@ grvingt-55:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915bfa9"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 bbaac767647..4a275ddeb73 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-56.yaml
@@ -76,10 +76,10 @@ grvingt-56:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91560cc"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 5b80addf520..0cf74d7f731 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-57.yaml
@@ -76,10 +76,10 @@ grvingt-57:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915dad7"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 1fd3a63bc34..2f6661d9d4e 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-58.yaml
@@ -76,10 +76,10 @@ grvingt-58:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b916ae11"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 ef799009422..bb725a8c2f1 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-59.yaml
@@ -76,10 +76,10 @@ grvingt-59:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915e558"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 1b4d90ce1e3..e4400665b4a 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-6.yaml
@@ -76,10 +76,10 @@ grvingt-6:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91b7199"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 ebf28813bca..45a42bb7bc8 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-60.yaml
@@ -76,10 +76,10 @@ grvingt-60:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b9153a9b"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 0e5bc1dd95a..06e72dfcf1b 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-61.yaml
@@ -76,10 +76,10 @@ grvingt-61:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91bb2b6"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 b8dfc534e7c..91c5dd6630d 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-62.yaml
@@ -76,10 +76,10 @@ grvingt-62:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b915c3b5"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 b1b5e69f733..13fac8c0083 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-63.yaml
@@ -76,10 +76,10 @@ grvingt-63:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91bad02"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 38bce017dca..8e1375b1dd0 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-64.yaml
@@ -76,10 +76,10 @@ grvingt-64:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91da1ef"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 b9375a7a903..e9987b907b2 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-7.yaml
@@ -76,10 +76,10 @@ grvingt-7:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91ba41c"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 d6e3bcf0ec7..980526fee3e 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-8.yaml
@@ -76,10 +76,10 @@ grvingt-8:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b91b7b04"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 99c809d994d..b68743a160b 100644
--- a/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.yaml
+++ b/input/grid5000/sites/nancy/clusters/grvingt/nodes/grvingt-9.yaml
@@ -76,10 +76,10 @@ grvingt-9:
     version: Gold 6130
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500b916812a"
       by_path: "/dev/disk/by-path/pci-0000:00:11.5-ata-3"
       firmware_version: NB33
+      id: disk0
       model: ST1000NX0443
       size: 1000204886016
       storage: HDD
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 dd0b4d11215..bfa9791ac95 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-1.yaml
@@ -82,10 +82,10 @@ econome-1:
     version: E5-2660
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b1bb39c5"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 f37fa2cd216..ae6f4a1ad62 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-10.yaml
@@ -82,10 +82,10 @@ econome-10:
     version: E5-2660
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee207107ae8"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 55adba3c217..e20de0c2dfc 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-11.yaml
@@ -82,10 +82,10 @@ econome-11:
     version: E5-2660
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b1bb4a6d"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 8a1c6365d27..19207fd3fac 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-12.yaml
@@ -82,10 +82,10 @@ econome-12:
     version: E5-2660
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c65a85b"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 b3ade7f0638..6d08abfdfc9 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-13.yaml
@@ -82,10 +82,10 @@ econome-13:
     version: E5-2660
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b1ba5d63"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 71e64ba2b43..06c7d890bfa 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-14.yaml
@@ -82,10 +82,10 @@ econome-14:
     version: E5-2660
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee207106c19"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 b0dba705b8d..6c9f5406362 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-15.yaml
@@ -83,10 +83,10 @@ econome-15:
     version: E5-2660
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c659979"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 87a15b06c26..41e40e4ce92 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-16.yaml
@@ -82,10 +82,10 @@ econome-16:
     version: E5-2660
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c64d23d"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 143b5163cc3..4cbca1b5b7b 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-17.yaml
@@ -82,10 +82,10 @@ econome-17:
     version: E5-2660
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c6594dc"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 e6356b1560f..541181d53d2 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-18.yaml
@@ -82,10 +82,10 @@ econome-18:
     version: E5-2660
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b1ba84f1"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 b448ba3e8f7..66e979a3eff 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-19.yaml
@@ -82,10 +82,10 @@ econome-19:
     version: E5-2660
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c655ff4"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D06
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 8f50cee6680..49eec5435b2 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-2.yaml
@@ -82,10 +82,10 @@ econome-2:
     version: E5-2660
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b1bb4095"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 ab98e21102f..70d6ae9bc7d 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-20.yaml
@@ -82,10 +82,10 @@ econome-20:
     version: E5-2660
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c658eea"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D06
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 3c5aba762ca..7c9c60987b9 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-21.yaml
@@ -82,10 +82,10 @@ econome-21:
     version: E5-2660
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee207106833"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D06
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 6dedb846f27..aaa18292f26 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-22.yaml
@@ -82,10 +82,10 @@ econome-22:
     version: E5-2660
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2071063ca"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D06
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 ee30db865ff..87a112373eb 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-3.yaml
@@ -82,10 +82,10 @@ econome-3:
     version: E5-2660
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c659502"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 0e4378b024b..517b0eafd47 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-4.yaml
@@ -82,10 +82,10 @@ econome-4:
     version: E5-2660
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c65918c"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 38bf7bce504..21ffc911644 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-5.yaml
@@ -82,10 +82,10 @@ econome-5:
     version: E5-2660
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee25c658e9c"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 03ed42be29e..345a30e1f82 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-6.yaml
@@ -82,10 +82,10 @@ econome-6:
     version: E5-2660
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee207107f8d"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 13b48ce81b5..1160a3b5397 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-7.yaml
@@ -82,10 +82,10 @@ econome-7:
     version: E5-2660
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b1bb3ef7"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 dcb755cff54..645599e52ef 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-8.yaml
@@ -82,10 +82,10 @@ econome-8:
     version: E5-2660
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee2b1bb484c"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 aedc96b90be..2136fb54ccf 100644
--- a/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
+++ b/input/grid5000/sites/nantes/clusters/econome/nodes/econome-9.yaml
@@ -82,10 +82,10 @@ econome-9:
     version: E5-2660
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee207109227"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 01.01D05
+      id: disk0
       model: WDC WD2003FYYS-1
       size: 2000398934016
       storage: HDD
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 416ced84d21..9ce6d95af6a 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-1.yaml
@@ -83,10 +83,10 @@ ecotype-1:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc890071"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 13caca7d581..94190b569ff 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-10.yaml
@@ -83,10 +83,10 @@ ecotype-10:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc890041"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 81237d70c9d..be68c8010ae 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-11.yaml
@@ -83,10 +83,10 @@ ecotype-11:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a969"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 c47f9a2ef56..186e89dcc98 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-12.yaml
@@ -83,10 +83,10 @@ ecotype-12:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a90d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 1f090ca3da6..f6d34e6d15b 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-13.yaml
@@ -83,10 +83,10 @@ ecotype-13:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc890009"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 226766f59df..26dc311add7 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-14.yaml
@@ -83,10 +83,10 @@ ecotype-14:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc88fff5"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 3a8c5c75041..a0344e11249 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-15.yaml
@@ -83,10 +83,10 @@ ecotype-15:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc88fffd"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 f97ce165ff0..cf0ef252a86 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-16.yaml
@@ -83,10 +83,10 @@ ecotype-16:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc890061"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 4d21380941a..6886e06be17 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-17.yaml
@@ -83,10 +83,10 @@ ecotype-17:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc88c98d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 f81bf418c8c..57ca0400935 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-18.yaml
@@ -83,10 +83,10 @@ ecotype-18:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc890005"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 b9b4356df25..54141f2f816 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-19.yaml
@@ -83,10 +83,10 @@ ecotype-19:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc88c985"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 9ff13666a30..c06eafb0d5a 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-2.yaml
@@ -83,10 +83,10 @@ ecotype-2:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc890079"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 c14022be364..146b35e9901 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-20.yaml
@@ -83,10 +83,10 @@ ecotype-20:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89006d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 3d119982e42..6a79c57ca7b 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-21.yaml
@@ -83,10 +83,10 @@ ecotype-21:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a92d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 1da48f72c3a..a8b538db54f 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-22.yaml
@@ -83,10 +83,10 @@ ecotype-22:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc88ffe5"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 acb8af7f5e4..9674ad756ce 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-23.yaml
@@ -83,10 +83,10 @@ ecotype-23:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a9b9"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 463964e978b..807ab835335 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-24.yaml
@@ -83,10 +83,10 @@ ecotype-24:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89ff4d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 2895a2b803e..d894fc16530 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-25.yaml
@@ -83,10 +83,10 @@ ecotype-25:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a955"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 1722ee389fe..5f1365a6408 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-26.yaml
@@ -83,10 +83,10 @@ ecotype-26:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a949"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 69b23c416bb..9736c3cf1e7 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-27.yaml
@@ -83,10 +83,10 @@ ecotype-27:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a915"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 1aee6d8e8aa..e1c5d51be75 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-28.yaml
@@ -83,10 +83,10 @@ ecotype-28:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a921"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 fcb68749736..2d901ce8723 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-29.yaml
@@ -83,10 +83,10 @@ ecotype-29:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a931"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 1a04acb0017..9cfb9cca781 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-3.yaml
@@ -83,10 +83,10 @@ ecotype-3:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc890035"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 3c155926a91..306fba64143 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-30.yaml
@@ -83,10 +83,10 @@ ecotype-30:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a975"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 dd857e53302..a1988195cfc 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-31.yaml
@@ -83,10 +83,10 @@ ecotype-31:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a941"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 7fc4b6d3bc7..4cdef17cff8 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-32.yaml
@@ -83,10 +83,10 @@ ecotype-32:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a929"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 4b2fafaca21..c8341beacab 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-33.yaml
@@ -83,10 +83,10 @@ ecotype-33:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a971"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 8d2e652986c..8acf7b6217a 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-34.yaml
@@ -83,10 +83,10 @@ ecotype-34:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a9ad"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 023e94ec8db..cedaf6f02ea 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-35.yaml
@@ -83,10 +83,10 @@ ecotype-35:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a9b1"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 b75902a667c..bfa4541df28 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-36.yaml
@@ -83,10 +83,10 @@ ecotype-36:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a919"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 1a8c3c30ca0..7b2f0625aee 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-37.yaml
@@ -83,10 +83,10 @@ ecotype-37:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a9a1"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 91fc08f3b4a..8cf93bc84a8 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-38.yaml
@@ -83,10 +83,10 @@ ecotype-38:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89ff21"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 515c00149a5..9caa3312bd9 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-39.yaml
@@ -83,10 +83,10 @@ ecotype-39:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a999"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 5d89fd0905c..f5244674081 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-4.yaml
@@ -83,10 +83,10 @@ ecotype-4:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89000d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 c983ad3ddec..aecf0c5fe34 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-40.yaml
@@ -83,10 +83,10 @@ ecotype-40:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a96d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 2008a9c5385..f785df0092c 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-41.yaml
@@ -83,10 +83,10 @@ ecotype-41:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a91d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 1102db16a63..7837dc485b6 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-42.yaml
@@ -83,10 +83,10 @@ ecotype-42:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a945"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 6976dc57cd8..3166adab6b6 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-43.yaml
@@ -83,10 +83,10 @@ ecotype-43:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc890021"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 81cdd64deae..8507c2f3d1a 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-44.yaml
@@ -83,10 +83,10 @@ ecotype-44:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a911"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 5a626465c11..d235a69790c 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-45.yaml
@@ -83,10 +83,10 @@ ecotype-45:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc890065"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 d86b6c94ccd..2a765de72c1 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-46.yaml
@@ -83,10 +83,10 @@ ecotype-46:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89ff1d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 a2217849574..dd8237dbb6f 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-47.yaml
@@ -83,10 +83,10 @@ ecotype-47:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc88fff1"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 4013962078e..951c427acd6 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-48.yaml
@@ -83,10 +83,10 @@ ecotype-48:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a9a5"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 27f3690c24e..995f78e3249 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-5.yaml
@@ -83,10 +83,10 @@ ecotype-5:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc890081"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 b0b0c046a9c..81c2658959e 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-6.yaml
@@ -83,10 +83,10 @@ ecotype-6:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc890011"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 50b04d89b7b..073fc57f331 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-7.yaml
@@ -83,10 +83,10 @@ ecotype-7:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89a94d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 63fcf173229..8cd0b547535 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-8.yaml
@@ -83,10 +83,10 @@ ecotype-8:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89ff19"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 4b07a37a967..3f51fe3e1f9 100644
--- a/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml
+++ b/input/grid5000/sites/nantes/clusters/ecotype/nodes/ecotype-9.yaml
@@ -83,10 +83,10 @@ ecotype-9:
     version: E5-2630L v4
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000397cc89001d"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: AM07
+      id: disk0
       model: PX04SMB040
       size: 400088457216
       storage: SSD
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 3e6e52174b5..39595e75c0c 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml
@@ -84,42 +84,42 @@ paranoia-1:
     version: E5-2660 v2
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df1a80"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy0-lun-0"
       firmware_version: D1S6
+      id: disk0
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       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
+      id: disk3
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       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
+      id: disk4
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
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 d7d68c58919..12f034b65c9 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml
@@ -84,42 +84,42 @@ paranoia-2:
     version: E5-2660 v2
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0288e4d4"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy0-lun-0"
       firmware_version: D1S6
+      id: disk0
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       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
+      id: disk3
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       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
+      id: disk4
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
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 ddb7696dd62..7eadf788541 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml
@@ -84,42 +84,42 @@ paranoia-3:
     version: E5-2660 v2
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee755948ca4"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy0-lun-0"
       firmware_version: D1P3
+      id: disk0
       model: WD6002BKTG
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       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
+      id: disk3
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       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
+      id: disk4
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
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 9052b983733..45e882d0068 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml
@@ -84,42 +84,42 @@ paranoia-4:
     version: E5-2660 v2
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f0288ddc4"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy0-lun-0"
       firmware_version: D1S6
+      id: disk0
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       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
+      id: disk3
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       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
+      id: disk4
       model: WD6002BKTG
       size: 600127266816
       storage: HDD
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 96765d603a1..d071b37ca23 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml
@@ -84,42 +84,42 @@ paranoia-5:
     version: E5-2660 v2
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022bf824"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy0-lun-0"
       firmware_version: D1S6
+      id: disk0
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       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
+      id: disk3
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       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
+      id: disk4
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
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 5c5817a5974..b992dfc048f 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml
@@ -84,42 +84,42 @@ paranoia-6:
     version: E5-2660 v2
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022bf804"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy0-lun-0"
       firmware_version: D1S6
+      id: disk0
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       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
+      id: disk3
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       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
+      id: disk4
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
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 4f470ea22ef..4ed6a672999 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml
@@ -84,42 +84,42 @@ paranoia-7:
     version: E5-2660 v2
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f022bf654"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy0-lun-0"
       firmware_version: D1S6
+      id: disk0
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       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
+      id: disk3
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       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
+      id: disk4
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
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 ca1dd968d1f..f49364a403d 100644
--- a/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml
@@ -84,42 +84,42 @@ paranoia-8:
     version: E5-2660 v2
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50000c0f02df020c"
       by_path: "/dev/disk/by-path/pci-0000:82:00.0-sas-phy0-lun-0"
       firmware_version: D1S6
+      id: disk0
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       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
+      id: disk3
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       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
+      id: disk4
       model: WD6001BKHG
       size: 600127266816
       storage: HDD
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 83a22d0e749..829c913197f 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml
@@ -87,10 +87,10 @@ parapide-1:
     version: X5570
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214cb8ec2"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC5A
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 bb8fe9b3d88..2140717e0cd 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml
@@ -87,10 +87,10 @@ parapide-10:
     version: X5570
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214ca8844"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC5A
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 1ce99ac3eeb..101e5c9205d 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.yaml
@@ -87,10 +87,10 @@ parapide-12:
     version: X5570
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214cb9dc5"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC5A
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 a6167edfc4a..4098d24f6fe 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.yaml
@@ -87,10 +87,10 @@ parapide-13:
     version: X5570
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214cbef65"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC5A
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 7d1ab1893be..72753a22e4d 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.yaml
@@ -87,10 +87,10 @@ parapide-16:
     version: X5570
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214ca6979"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC4A
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 87cc40652c6..cc3602d39eb 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.yaml
@@ -87,10 +87,10 @@ parapide-18:
     version: X5570
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214ca831b"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC5A
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 c05283082ae..b1c3c0b07b8 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.yaml
@@ -87,10 +87,10 @@ parapide-19:
     version: X5570
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214ca7cc8"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC5A
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 67b9cef09cb..735d71980ec 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.yaml
@@ -87,10 +87,10 @@ parapide-2:
     version: X5570
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214cb9da8"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC5A
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 7a78ecd8d76..a188d9e03c3 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.yaml
@@ -87,10 +87,10 @@ parapide-21:
     version: X5570
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214cb9da5"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC5A
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 8fc3b4dd761..12db91b9152 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.yaml
@@ -87,10 +87,10 @@ parapide-24:
     version: X5570
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214c88487"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC4A
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 d0be98aca14..73643a91aad 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.yaml
@@ -87,10 +87,10 @@ parapide-25:
     version: X5570
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214ca2a94"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC4A
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 263d392555b..173547b478d 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.yaml
@@ -87,10 +87,10 @@ parapide-3:
     version: X5570
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214cb19b0"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC5A
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 e807b8e718f..3749953a97d 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.yaml
@@ -87,10 +87,10 @@ parapide-5:
     version: X5570
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214ca6cca"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC4A
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 6c2716e2503..7eecf5cdf7d 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.yaml
@@ -87,10 +87,10 @@ parapide-6:
     version: X5570
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214ca8327"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC5A
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 b44471bebdd..b4030b5b4fb 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.yaml
@@ -87,10 +87,10 @@ parapide-7:
     version: X5570
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214ca6ca1"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC4A
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 839ab0a5565..c84a6a03104 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.yaml
@@ -87,10 +87,10 @@ parapide-8:
     version: X5570
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214ca5db1"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC5A
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 bae54d87b13..7bceb72b251 100644
--- a/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.yaml
@@ -87,10 +87,10 @@ parapide-9:
     version: X5570
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000cca214cb9dba"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: GK6OAC5A
+      id: disk0
       model: HITACHI HUA7250S
       size: 500107862016
       storage: HDD
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 0f8665ba2a7..78efc72b399 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.yaml
@@ -106,10 +106,10 @@ parapluie-1:
     version: 6164 HE
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5002673a867"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 e9e0e6337ab..499160f322b 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.yaml
@@ -106,10 +106,10 @@ parapluie-11:
     version: 6164 HE
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500267425e2"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 51655a60f4d..13beb6bd54f 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.yaml
@@ -106,10 +106,10 @@ parapluie-12:
     version: 6164 HE
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500267381ab"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 adce161631a..bac9aca6d5a 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.yaml
@@ -106,10 +106,10 @@ parapluie-15:
     version: 6164 HE
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50026742543"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 87462881878..34aba9d74df 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.yaml
@@ -106,10 +106,10 @@ parapluie-19:
     version: 6164 HE
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500266f79b9"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 a863269ffc7..bbbe1fb8045 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.yaml
@@ -106,10 +106,10 @@ parapluie-2:
     version: 6164 HE
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5002673584e"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 803cfa65d4a..70e9876c878 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.yaml
@@ -106,10 +106,10 @@ parapluie-20:
     version: 6164 HE
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5002673c0bf"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 f5b1be6fdb8..2b3b258cc01 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.yaml
@@ -106,10 +106,10 @@ parapluie-21:
     version: 6164 HE
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50026742333"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 b04be60f60f..e06486173e4 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.yaml
@@ -106,10 +106,10 @@ parapluie-22:
     version: 6164 HE
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5002673e9f4"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 ad3b4a830fd..8128829da39 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.yaml
@@ -106,10 +106,10 @@ parapluie-25:
     version: 6164 HE
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5002673da68"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 4745a6938c6..7881d40b561 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.yaml
@@ -106,10 +106,10 @@ parapluie-28:
     version: 6164 HE
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5002674695f"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 f3bafce1ed7..dbc52954c9f 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.yaml
@@ -106,10 +106,10 @@ parapluie-31:
     version: 6164 HE
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50026732a4a"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 7e94a0a1864..cb0d6149bd7 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.yaml
@@ -106,10 +106,10 @@ parapluie-32:
     version: 6164 HE
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5002674224e"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 e05248a1c1c..9f5e0f0f15d 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.yaml
@@ -106,10 +106,10 @@ parapluie-35:
     version: 6164 HE
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5002673f30f"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 a5bc096aa87..fef98b92952 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.yaml
@@ -106,10 +106,10 @@ parapluie-38:
     version: 6164 HE
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c500267365d0"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 e2cece0e7d4..d5c861f057a 100644
--- a/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.yaml
@@ -106,10 +106,10 @@ parapluie-9:
     version: 6164 HE
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5002673a23e"
       by_path: "/dev/disk/by-path/pci-0000:00:11.0-ata-1"
       firmware_version: HPG0
+      id: disk0
       model: VB0250EAVER
       size: 250059350016
       storage: HDD
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 7bc4705fcd8..06be2a81a9c 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.yaml
@@ -83,50 +83,50 @@ parasilo-1:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecfa5b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4abf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3b3b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
+      id: disk2
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecfaaf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
+      id: disk3
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ece7a7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
+      id: disk4
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0444"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 07ca0e16605..75a00d9425b 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.yaml
@@ -83,50 +83,50 @@ parasilo-10:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb564b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ece93b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed38cb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
+      id: disk2
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ece58b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
+      id: disk3
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed39bf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
+      id: disk4
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0440"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 4cc47c3da47..e7e0ab1050d 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.yaml
@@ -83,50 +83,50 @@ parasilo-11:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2cb7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed330f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea138f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
+      id: disk2
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed25bf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
+      id: disk3
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4bf7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
+      id: disk4
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0434"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 b1c22de9a4f..064849bc29e 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.yaml
@@ -83,50 +83,50 @@ parasilo-12:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf8bb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2183"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf31b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
+      id: disk2
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4d2b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
+      id: disk3
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3e5b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
+      id: disk4
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0448"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 87ca15cf41a..ef1eeeeca66 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.yaml
@@ -83,50 +83,50 @@ parasilo-13:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb5853"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecfaef"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5757"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
+      id: disk2
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5743"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
+      id: disk3
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x50000399b850bdad"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: EF05
+      id: disk4
       model: AL15SEB060NY
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0428"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 ae3dc096242..947b1e42711 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.yaml
@@ -83,50 +83,50 @@ parasilo-14:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea2ad3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea46e7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb6203"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
+      id: disk2
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea4b47"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
+      id: disk3
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9e10b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
+      id: disk4
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0418"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 567c2a710f1..6fb9628a0a8 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.yaml
@@ -83,50 +83,50 @@ parasilo-15:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed51df"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed54a3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed53b7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
+      id: disk2
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2987"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
+      id: disk3
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5473"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
+      id: disk4
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a045c"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 e16f3cc56bb..25507b07d0c 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.yaml
@@ -83,50 +83,50 @@ parasilo-16:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5007f5bda57"
       by_path: "/dev/disk/by-path/pci-0000:02:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       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
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       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
+      id: disk2
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       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
+      id: disk3
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       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
+      id: disk4
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       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
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 efc711acfa0..1ab9113d8c1 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.yaml
@@ -83,50 +83,50 @@ parasilo-17:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecfb4f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3eeb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf927"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
+      id: disk2
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed58a7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
+      id: disk3
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9fe5f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
+      id: disk4
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0414"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 10b41426740..d429d3922c6 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.yaml
@@ -83,50 +83,50 @@ parasilo-18:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb4ba3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea4973"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb850b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
+      id: disk2
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea04a3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
+      id: disk3
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea0cc3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
+      id: disk4
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0474"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 58bd2894afd..5c0fa0a72b7 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.yaml
@@ -83,50 +83,50 @@ parasilo-19:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ececf7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ece23f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed576b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
+      id: disk2
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3927"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
+      id: disk3
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecfa2b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
+      id: disk4
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0410"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 a5b375682ba..993b8b9d7ea 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.yaml
@@ -83,50 +83,50 @@ parasilo-2:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5147"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4caf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2c57"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
+      id: disk2
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed21c7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
+      id: disk3
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2f4b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
+      id: disk4
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0424"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 dfba28fec2a..271ed3c60d1 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.yaml
@@ -83,50 +83,50 @@ parasilo-20:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb45d3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecfa17"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed545f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
+      id: disk2
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4dcf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
+      id: disk3
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb4c87"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
+      id: disk4
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0488"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 3c58b1cacd0..5444f7b4b80 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.yaml
@@ -83,50 +83,50 @@ parasilo-21:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4767"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5747"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed20e7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
+      id: disk2
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecea1f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
+      id: disk3
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed52b3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
+      id: disk4
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0454"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 2df9164ec17..73caa721c91 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.yaml
@@ -83,50 +83,50 @@ parasilo-22:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf3c7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf97b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecec93"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
+      id: disk2
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2273"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
+      id: disk3
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf603"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
+      id: disk4
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0450"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 96ce7516487..f60ff4104e9 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.yaml
@@ -83,50 +83,50 @@ parasilo-23:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb74eb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea2bff"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea4937"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
+      id: disk2
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea47f3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
+      id: disk3
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea0e53"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
+      id: disk4
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a044c"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 63d0ad8d534..2e9a728be4c 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.yaml
@@ -83,50 +83,50 @@ parasilo-24:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb7557"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb6ca7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb93bb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
+      id: disk2
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea7143"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
+      id: disk3
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea041f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
+      id: disk4
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0460"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 a67c4aba3fe..b326b40f93f 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.yaml
@@ -83,50 +83,50 @@ parasilo-25:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea2faf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb964f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c5009f30f6bb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: VT33
+      id: disk2
       model: ST600MP0005
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9fdff"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
+      id: disk3
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea6a27"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
+      id: disk4
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0464"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 a859a9e6ba6..9e8e62e5a07 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.yaml
@@ -83,50 +83,50 @@ parasilo-26:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4c4f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf353"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5467"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
+      id: disk2
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed527b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
+      id: disk3
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed511b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
+      id: disk4
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a048c"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 2ffae121421..215ba6e7b0c 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.yaml
@@ -83,50 +83,50 @@ parasilo-27:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2263"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecdef7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5573"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
+      id: disk2
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed226b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
+      id: disk3
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed579b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
+      id: disk4
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a06f4"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 9dafdd14f74..7d04f425492 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.yaml
@@ -83,50 +83,50 @@ parasilo-28:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea4a93"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb5193"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea0b1b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
+      id: disk2
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea7053"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
+      id: disk3
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb4f87"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
+      id: disk4
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0468"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 e73513821c0..723aa92ea3c 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.yaml
@@ -83,50 +83,50 @@ parasilo-3:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf8d7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3b0f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ececbb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
+      id: disk2
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb87f7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
+      id: disk3
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3d8f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
+      id: disk4
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0498"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 068dca4258e..11f7ccd0c48 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.yaml
@@ -83,50 +83,50 @@ parasilo-4:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2f5f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ece5b7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3b47"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
+      id: disk2
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4847"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
+      id: disk3
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf913"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
+      id: disk4
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0490"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 20b80d5c66a..a38deef8fda 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.yaml
@@ -83,50 +83,50 @@ parasilo-5:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed310f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5587"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3283"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
+      id: disk2
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2eeb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
+      id: disk3
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3183"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
+      id: disk4
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0458"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 70a39dfebc6..9ee88c9143d 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.yaml
@@ -83,50 +83,50 @@ parasilo-6:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2d4f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed570f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed466b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
+      id: disk2
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3eff"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
+      id: disk3
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed29a7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
+      id: disk4
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x500003973c889ab1"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: AM07
+      id: disk5
       model: PX04SHB020
       size: 200049647616
       storage: SSD
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 6bcc2af1b13..5b1e48acee9 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.yaml
@@ -83,50 +83,50 @@ parasilo-7:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2a37"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5597"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf0cb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
+      id: disk2
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ece9f3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
+      id: disk3
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ece66b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
+      id: disk4
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a0438"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 0dfe8172843..fbd6f4421f2 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.yaml
@@ -83,50 +83,50 @@ parasilo-8:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed553f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eafca7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2a9b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
+      id: disk2
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3ca3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
+      id: disk3
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed22b3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
+      id: disk4
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a043c"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 4b7ae334792..4a77c96f761 100644
--- a/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.yaml
@@ -83,50 +83,50 @@ parasilo-9:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed518f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2693"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdc:
-      id: "disk2"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed219b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:2:0"
       firmware_version: LS0C
+      id: disk2
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdd:
-      id: "disk3"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed30ff"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:3:0"
       firmware_version: LS0C
+      id: disk3
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sde:
-      id: "disk4"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb778f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:4:0"
       firmware_version: LS0C
+      id: disk4
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdf:
-      id: "disk5"
       by_id: "/dev/disk/by-id/wwn-0x50000395ec8a041c"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:5:0"
       firmware_version: A4B3
+      id: disk5
       model: PX02SSF020
       size: 200049647616
       storage: SSD
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 883d2089b25..c0ae2ce6acb 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-1.yaml
@@ -83,18 +83,18 @@ paravance-1:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb4fbb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb8577"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 ad6762b9cba..2d762e75e7b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-10.yaml
@@ -83,18 +83,18 @@ paravance-10:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb9323"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2f8b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 1ad97ca6c87..4fed65c26a4 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-11.yaml
@@ -83,18 +83,18 @@ paravance-11:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea949f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea738f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 fe26b9aae6a..5fe62ea55ae 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-12.yaml
@@ -83,18 +83,18 @@ paravance-12:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eae1bb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eafe1b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 d672a41e4f0..beeee9f36d1 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-13.yaml
@@ -83,18 +83,18 @@ paravance-13:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eae193"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb4923"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 f62879c4806..93c20c64800 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-14.yaml
@@ -83,18 +83,18 @@ paravance-14:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb4c03"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eac923"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 2863d9a3532..901b4b9e9aa 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-15.yaml
@@ -83,18 +83,18 @@ paravance-15:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb8583"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb47c3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 944cca2f7c3..6dd648076bf 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-16.yaml
@@ -83,18 +83,18 @@ paravance-16:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed301b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2687"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 fda739d0591..855add5a128 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-17.yaml
@@ -83,18 +83,18 @@ paravance-17:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea4927"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb8893"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 8cae431f33d..fbd6f6b0462 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-18.yaml
@@ -83,18 +83,18 @@ paravance-18:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea91a7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb470b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 9ebaac8f1e6..fa1a97d8b97 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-19.yaml
@@ -83,18 +83,18 @@ paravance-19:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3fff"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2acf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 e032fd5f48e..641238d68f6 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-2.yaml
@@ -83,18 +83,18 @@ paravance-2:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea3313"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea29a3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 7655a57c1e5..b7a38289a35 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-20.yaml
@@ -83,18 +83,18 @@ paravance-20:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb4fe3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb762f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 ceaa717a488..9e773574155 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-21.yaml
@@ -83,18 +83,18 @@ paravance-21:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5007e83552f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c5007e8343bf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 e1a8a8b2c87..119143045e4 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-22.yaml
@@ -83,18 +83,18 @@ paravance-22:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb6bf7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9d847"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 fbf3ac6ad6a..00cf18e59a2 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-23.yaml
@@ -83,18 +83,18 @@ paravance-23:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea2f03"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb5833"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 e748f2dbe0a..ff2e38edb0c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-24.yaml
@@ -83,18 +83,18 @@ paravance-24:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea87eb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea6a53"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 7a41337168f..8a3d32870e1 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-25.yaml
@@ -83,18 +83,18 @@ paravance-25:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed595b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf5fb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 68e18fe6e40..bfd68e48b7d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-26.yaml
@@ -83,18 +83,18 @@ paravance-26:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eceba3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed57cf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 046441d153e..c839cf5fa5d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-27.yaml
@@ -83,18 +83,18 @@ paravance-27:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3007"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb577b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 0b59319af67..6117ea80744 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-28.yaml
@@ -83,18 +83,18 @@ paravance-28:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea69e7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea4a83"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 41b1716b5f3..c338879c081 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-29.yaml
@@ -83,18 +83,18 @@ paravance-29:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed269f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed5703"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 f6944cbfe9c..0b5a369ed12 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-3.yaml
@@ -83,18 +83,18 @@ paravance-3:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb48c7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb7233"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 0f410d5f7bc..327e6ae1c1d 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-30.yaml
@@ -83,18 +83,18 @@ paravance-30:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb2f1b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea8ee3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 be4e53c3c2d..585f6ba7f32 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-31.yaml
@@ -83,18 +83,18 @@ paravance-31:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eada3b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb25a7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 1055b0ba5fb..d7767e6b3cf 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-32.yaml
@@ -83,18 +83,18 @@ paravance-32:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb72df"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea1343"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 bf652bc41be..5734f66628c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-33.yaml
@@ -83,18 +83,18 @@ paravance-33:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed2e33"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3ac3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 f5eef1c5cbb..6e98b454df2 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-34.yaml
@@ -83,18 +83,18 @@ paravance-34:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eab427"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea85f7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 8a3c4c6b3e5..6e9aad3589f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-35.yaml
@@ -83,18 +83,18 @@ paravance-35:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecfa73"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed54e3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 09e7eee3060..e35c1a56a88 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-36.yaml
@@ -83,18 +83,18 @@ paravance-36:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf9d7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed3047"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 7ec853951ba..786a9860291 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-37.yaml
@@ -83,18 +83,18 @@ paravance-37:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb2f73"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb87cf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 03f58939baa..aadc32d04bf 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-38.yaml
@@ -83,18 +83,18 @@ paravance-38:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea75d7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb010b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 b88c4fc6b69..36aaca2e2f8 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-39.yaml
@@ -83,18 +83,18 @@ paravance-39:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea8def"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ead217"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 cd9146ad213..26c074feeca 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-4.yaml
@@ -83,18 +83,18 @@ paravance-4:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb4d87"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea08bb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 f28a3b1dc7c..83bb71ea743 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-40.yaml
@@ -83,18 +83,18 @@ paravance-40:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb186f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb7717"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 bf5e0f4b4c5..dc40eb7fe79 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-41.yaml
@@ -83,18 +83,18 @@ paravance-41:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea78cb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb0323"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 2d715bf6b1f..8fd0e1719bb 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-42.yaml
@@ -83,18 +83,18 @@ paravance-42:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eadf73"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb6d47"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 afa6da9879b..f2557c8c09f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-43.yaml
@@ -83,18 +83,18 @@ paravance-43:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9fe5b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea9baf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 66a9849202a..c5fdc36bfa9 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-44.yaml
@@ -83,18 +83,18 @@ paravance-44:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea13a7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb0dfb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 0ffbd670d04..97c651ba2c3 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-45.yaml
@@ -83,18 +83,18 @@ paravance-45:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb77bf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb72c3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 b2ac3f11ca2..a400439c86b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-46.yaml
@@ -83,18 +83,18 @@ paravance-46:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eafecf"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eacc33"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 0cd25ef66ed..1741d4c2491 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-47.yaml
@@ -83,18 +83,18 @@ paravance-47:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed513b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed580f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 949eeec65b5..51f195d4540 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-48.yaml
@@ -83,18 +83,18 @@ paravance-48:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea9bf7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea7a7b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 b60fd111d22..457b31bba48 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-49.yaml
@@ -83,18 +83,18 @@ paravance-49:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea4d8f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea6fbb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 38d758f14f7..9b32104958f 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-5.yaml
@@ -83,18 +83,18 @@ paravance-5:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea014f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eabc07"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 c19978c8900..f7e11ca2fd8 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-50.yaml
@@ -83,18 +83,18 @@ paravance-50:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb8537"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb6af7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 dec06f6535b..cfcc6732283 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-51.yaml
@@ -83,18 +83,18 @@ paravance-51:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb1597"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb1717"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 f3006a57927..8c059cab370 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-52.yaml
@@ -83,18 +83,18 @@ paravance-52:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea7627"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea6fa7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 7137ba8e6a3..c522626a6ac 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-53.yaml
@@ -83,18 +83,18 @@ paravance-53:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb886f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed481f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 6e7787803be..52dcac5f5ae 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-54.yaml
@@ -83,18 +83,18 @@ paravance-54:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9fe77"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9ef77"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 ddd8f04f73b..8b70b66779c 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-55.yaml
@@ -83,18 +83,18 @@ paravance-55:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed290b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4ceb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 0ae956c25a3..89a97f984ec 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-56.yaml
@@ -83,18 +83,18 @@ paravance-56:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea7c83"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea8057"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 f7a64c1cfbb..07a3870c1bd 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-57.yaml
@@ -83,18 +83,18 @@ paravance-57:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb394b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eabc23"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 3eec8947257..71a99b6acf7 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-58.yaml
@@ -83,18 +83,18 @@ paravance-58:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecdf53"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9d8af"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 ac62450b787..d2f8fd03278 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-59.yaml
@@ -83,18 +83,18 @@ paravance-59:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ead9ef"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecf54f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 bdfc5ccdf56..89bf8352339 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-6.yaml
@@ -83,18 +83,18 @@ paravance-6:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb47b3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb79bb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 20a29c0044d..cb505433d95 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-60.yaml
@@ -83,18 +83,18 @@ paravance-60:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb0ffb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb0767"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 9eac1e6688d..e58a9372ae5 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-61.yaml
@@ -83,18 +83,18 @@ paravance-61:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea0ef3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb509f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 c3205c7f814..cbce2364e7b 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-62.yaml
@@ -83,18 +83,18 @@ paravance-62:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5009833e3e7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb4b4b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 9e0707f7dd6..042b06419ad 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-63.yaml
@@ -83,18 +83,18 @@ paravance-63:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb4d27"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb5dd3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 81a06e6142f..8cc104e5691 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-64.yaml
@@ -83,18 +83,18 @@ paravance-64:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb2943"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea7977"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 e38b5868173..413d8641cd3 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-65.yaml
@@ -83,18 +83,18 @@ paravance-65:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb5607"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb8797"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 efe4e285586..5d7123f3921 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-66.yaml
@@ -83,18 +83,18 @@ paravance-66:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4c43"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed593b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 f211422ad71..a4ffa078827 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-67.yaml
@@ -83,18 +83,18 @@ paravance-67:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed21f7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4a2b"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 a9cce191101..a0b05c24f33 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-68.yaml
@@ -83,18 +83,18 @@ paravance-68:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ecea0f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ed4857"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 0bf6fce9915..3b4bb46a7e2 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-69.yaml
@@ -83,18 +83,18 @@ paravance-69:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb7ffb"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb733f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 b67be535409..740b58ff6f5 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-7.yaml
@@ -83,18 +83,18 @@ paravance-7:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9e3f7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eaafe3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 5f224fa2ff8..b2417a2761e 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-70.yaml
@@ -83,18 +83,18 @@ paravance-70:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb349f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea46f7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 bf7c50df761..73a89840df5 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-71.yaml
@@ -83,18 +83,18 @@ paravance-71:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ead253"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea8fc7"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 0f41961e495..8f439146f08 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-72.yaml
@@ -83,18 +83,18 @@ paravance-72:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c5007e834757"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eabb77"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 e3753c67be9..1a47202f5a3 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-8.yaml
@@ -83,18 +83,18 @@ paravance-8:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea0ac3"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062eb8003"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 fe8b6b588be..cbdafe0b303 100644
--- a/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
+++ b/input/grid5000/sites/rennes/clusters/paravance/nodes/paravance-9.yaml
@@ -83,18 +83,18 @@ paravance-9:
     version: E5-2630 v3
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062e9fe9f"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:0:0"
       firmware_version: LS0C
+      id: disk0
       model: ST600MM0006
       size: 600127266816
       storage: HDD
     sdb:
-      id: "disk1"
       by_id: "/dev/disk/by-id/wwn-0x5000c50062ea9c67"
       by_path: "/dev/disk/by-path/pci-0000:03:00.0-scsi-0:0:1:0"
       firmware_version: LS0C
+      id: disk1
       model: ST600MM0006
       size: 600127266816
       storage: HDD
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 588137b7dfa..d8e4c36c4d8 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-1.yaml
@@ -87,10 +87,10 @@ uvb-1:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee10377365d"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 c486d08a6c9..607661ff4d7 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.yaml
@@ -87,10 +87,10 @@ uvb-10:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee158d2ac9e"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 9ca1f6f2bb8..a541409dd37 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.yaml
@@ -87,10 +87,10 @@ uvb-11:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee1037d9b0a"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 aecb4f7ab69..2a3bd3af1a7 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.yaml
@@ -87,10 +87,10 @@ uvb-12:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee1037dca3a"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 a5598703bf1..0423a5e7775 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-14.yaml
@@ -87,10 +87,10 @@ uvb-14:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee1ae21aa9f"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 4d1f9c3fd3e..16ec815e77f 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-16.yaml
@@ -87,10 +87,10 @@ uvb-16:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee158d27392"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 e97ee0e2123..4b05a199344 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-17.yaml
@@ -87,10 +87,10 @@ uvb-17:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee103772647"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 cf52fd7954b..b61d3e27425 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-18.yaml
@@ -87,10 +87,10 @@ uvb-18:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee158d29b95"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 0fdc03e3271..5b9942aa148 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-2.yaml
@@ -87,10 +87,10 @@ uvb-2:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee103774dad"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 9090aa8a44b..ab58054748e 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-25.yaml
@@ -87,10 +87,10 @@ uvb-25:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee158c527af"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 bf0f78b4956..14a11e4cd84 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-26.yaml
@@ -87,10 +87,10 @@ uvb-26:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee1ae140810"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 ba9205b2ff6..36856357dc8 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-27.yaml
@@ -87,10 +87,10 @@ uvb-27:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee158c4f2bc"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 6405b469ab9..4fa3403f146 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-28.yaml
@@ -87,10 +87,10 @@ uvb-28:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee1ae13ef0b"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 98b5945046c..8750f6da7c0 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-29.yaml
@@ -87,10 +87,10 @@ uvb-29:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee1037d9c5c"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 e7a3fb9aaad..04f4338ee5b 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-31.yaml
@@ -87,10 +87,10 @@ uvb-31:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee158d2ab65"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 c7a47b1a830..277a55084bb 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-33.yaml
@@ -87,10 +87,10 @@ uvb-33:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee158df841f"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 72c0a5fd12d..4768fdacf2b 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-34.yaml
@@ -87,10 +87,10 @@ uvb-34:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee158d28b88"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 79613bd45e3..272b09edc3d 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-35.yaml
@@ -87,10 +87,10 @@ uvb-35:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee158d27497"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 2213e9570b1..5f030cc86f5 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-36.yaml
@@ -87,10 +87,10 @@ uvb-36:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee158d28666"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 1a71931b581..6c728154b62 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-37.yaml
@@ -87,10 +87,10 @@ uvb-37:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee158d2867d"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 ea747db8949..a697291fc36 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-38.yaml
@@ -87,10 +87,10 @@ uvb-38:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee1037db989"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 bbe8f908a57..5331fd35a90 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-4.yaml
@@ -87,10 +87,10 @@ uvb-4:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee10377055c"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 b517df3f3d4..387483c0f3d 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-41.yaml
@@ -87,10 +87,10 @@ uvb-41:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee1ae1b17e1"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 86b26cd749e..1fda15d354e 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-42.yaml
@@ -87,10 +87,10 @@ uvb-42:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee103771a9a"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 9b232a5b0f3..4f61a7889fa 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-43.yaml
@@ -87,10 +87,10 @@ uvb-43:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee158cc32ab"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 54a4c222552..d9c873ddca8 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-44.yaml
@@ -87,10 +87,10 @@ uvb-44:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee10377331d"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 6147d50ccdf..ee879ed5bfd 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-5.yaml
@@ -87,10 +87,10 @@ uvb-5:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee1ae216ca4"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 34e2a940522..5987b72716e 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-6.yaml
@@ -87,10 +87,10 @@ uvb-6:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee158d274c4"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 e09d6de1c74..c181ed8ef58 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-7.yaml
@@ -87,10 +87,10 @@ uvb-7:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee1037d9b68"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 78c78068ac8..d7bd8339b5d 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-8.yaml
@@ -87,10 +87,10 @@ uvb-8:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee1037d9480"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
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 5be0fee2be0..3656486378e 100644
--- a/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml
+++ b/input/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.yaml
@@ -87,10 +87,10 @@ uvb-9:
     version: X5670
   storage_devices:
     sda:
-      id: "disk0"
       by_id: "/dev/disk/by-id/wwn-0x50014ee158d2880d"
       by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
       firmware_version: 02.03B05
+      id: disk0
       model: WDC WD2502ABYS-1
       size: 250000000000
       storage: HDD
-- 
GitLab