orchestrator/rook: fix daemon_name field for mds

We have a label like that in rook now, so let's use it.

Signed-off-by: Jeff Layton <jlayton@redhat.com>

diff --git a/src/pybind/mgr/rook/module.py b/src/pybind/mgr/rook/module.py
index 1853606a75224de4f1ca5618d0017129fd467443..16e94961137bf4eef426d9f6a63c1a242e7c494d 100644 (file)
--- a/src/pybind/mgr/rook/module.py
+++ b/src/pybind/mgr/rook/module.py
@@ -347,10 +347,7 @@ class RookOrchestrator(MgrModule, orchestrator.Orchestrator):
             if service_type == "osd":
                 sl.daemon_name = "%s" % p['labels']["ceph-osd-id"]
             elif service_type == "mds":
-                # MDS daemon names are the tail of the pod name with
-                # an 'm' prefix.
-                # TODO: Would be nice to get this out a label though.
-                sl.daemon_name = "m" + sl.container_id.split("-")[-1]
+                sl.daemon_name = p['labels']["rook_file_system"]
             elif service_type == "mon":
                 sl.daemon_name = p['labels']["mon"]
             elif service_type == "mgr":