From 79bb26121aac81cf49ae4630edf3923e3d468bc0 Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Wed, 31 Oct 2018 13:35:44 -0400 Subject: [PATCH] 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 --- src/pybind/mgr/rook/module.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/pybind/mgr/rook/module.py b/src/pybind/mgr/rook/module.py index 1853606a752..16e94961137 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": -- 2.39.5