From: Michael Fritch <mfritch@suse.com>
Date: Tue, 17 Mar 2020 21:14:55 +0000 (-0600)
Subject: mgr/cephadm: combine `get_daemon_name` and `get_rados_user` funcs
X-Git-Tag: v16.1.0~2793^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fdf90bf530edbb9608fb8a5d273f7ce38147f534;p=ceph.git

mgr/cephadm: combine `get_daemon_name` and `get_rados_user` funcs

Signed-off-by: Michael Fritch <mfritch@suse.com>
---

diff --git a/src/pybind/mgr/cephadm/nfs.py b/src/pybind/mgr/cephadm/nfs.py
index afe06d0752b5..081b52378595 100644
--- a/src/pybind/mgr/cephadm/nfs.py
+++ b/src/pybind/mgr/cephadm/nfs.py
@@ -21,17 +21,13 @@ class NFSGanesha(object):
         self.daemon_id = daemon_id
         self.spec = spec
 
-    def get_daemon_name(self):
-        # type: () -> str
-        return '%s.%s' % (self.spec.service_type, self.daemon_id)
-
     def get_rados_user(self):
         # type: () -> str
-        return self.get_daemon_name()
+        return '%s.%s' % (self.spec.service_type, self.daemon_id)
 
     def get_rados_config_name(self):
         # type: () -> str
-        return 'conf-' + self.get_daemon_name()
+        return 'conf-' + self.get_rados_user()
 
     def get_rados_config_url(self):
         # type: () -> str