Merge branch 'nova_disk' into 'master'

...d5000/sites/lille/clusters/chifflet/nodes/chifflet-1.json

...d5000/sites/lille/clusters/chifflet/nodes/chifflet-2.json

...d5000/sites/lille/clusters/chifflet/nodes/chifflet-3.json

...d5000/sites/lille/clusters/chifflet/nodes/chifflet-4.json

...d5000/sites/lille/clusters/chifflet/nodes/chifflet-5.json

...d5000/sites/lille/clusters/chifflet/nodes/chifflet-6.json

...d5000/sites/lille/clusters/chifflet/nodes/chifflet-7.json

...d5000/sites/lille/clusters/chifflet/nodes/chifflet-8.json

...d5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json

...d5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json

...d5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json

...d5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json

...d5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json

...d5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json

...d5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json

...d5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json

...d5000/sites/lille/clusters/chifflet/nodes/chifflet-1.yaml

...d5000/sites/lille/clusters/chifflet/nodes/chifflet-2.yaml

...d5000/sites/lille/clusters/chifflet/nodes/chifflet-3.yaml

...d5000/sites/lille/clusters/chifflet/nodes/chifflet-4.yaml