From: Sage Weil <sage@redhat.com>
Date: Wed, 15 Jan 2020 14:53:03 +0000 (-0600)
Subject: mgr/rook: provide full path for devices names in inventory
X-Git-Tag: v15.1.0~206^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F32654%2Fhead;p=ceph.git

mgr/rook: provide full path for devices names in inventory

This matches the cephadm behavior.

Fixes: https://tracker.ceph.com/issues/43273
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/pybind/mgr/rook/module.py b/src/pybind/mgr/rook/module.py
index 73f53387b751..8f3dd1d85aa0 100644
--- a/src/pybind/mgr/rook/module.py
+++ b/src/pybind/mgr/rook/module.py
@@ -228,7 +228,7 @@ class RookOrchestrator(MgrModule, orchestrator.Orchestrator):
             devs = []
             for d in node_devs:
                 dev = inventory.Device(
-                    path=d['name'],
+                    path='/dev/' + d['name'],
                     sys_api=dict(
                         rotational='1' if d['rotational'] else '0',
                         size=d['size']