From: Michael Fritch <mfritch@suse.com>
Date: Mon, 9 Mar 2020 23:21:11 +0000 (-0600)
Subject: mgr/cephadm: fix service name for nfs type
X-Git-Tag: v15.2.1~19^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d06e006d92e31f8d021c815bb13133194ea6a26f;p=ceph.git

mgr/cephadm: fix service name for nfs type

the `nfs` service was incorrectly reported as `mds`

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit d9f04ec1d73948e915dda0f51592306542314238)
---

diff --git a/src/pybind/mgr/orchestrator/_interface.py b/src/pybind/mgr/orchestrator/_interface.py
index 329f0a1bc1cd..2eada033a5d1 100644
--- a/src/pybind/mgr/orchestrator/_interface.py
+++ b/src/pybind/mgr/orchestrator/_interface.py
@@ -1281,7 +1281,7 @@ class DaemonDescription(object):
             return 'rgw.%s' % s_name
         if self.daemon_type in ['mds', 'nfs']:
             _s_name = self.daemon_id.split('.')[0]
-            return 'mds.%s' % _s_name
+            return '%s.%s' % (self.daemon_type, _s_name)
         return self.daemon_type
 
     def __repr__(self):