From: Jeff Layton <jlayton@redhat.com>
Date: Wed, 31 Oct 2018 17:35:44 +0000 (-0400)
Subject: orchestrator/rook: fix daemon_name field for mds
X-Git-Tag: v14.1.0~885^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=79bb26121aac81cf49ae4630edf3923e3d468bc0;p=ceph.git

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 1853606a7522..16e94961137b 100644
--- 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":