]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: combine `get_daemon_name` and `get_rados_user` funcs
authorMichael Fritch <mfritch@suse.com>
Tue, 17 Mar 2020 21:14:55 +0000 (15:14 -0600)
committerMichael Fritch <mfritch@suse.com>
Wed, 25 Mar 2020 22:26:14 +0000 (16:26 -0600)
Signed-off-by: Michael Fritch <mfritch@suse.com>
src/pybind/mgr/cephadm/nfs.py

index afe06d0752b52657f8cf8c6620567e7749f5deb6..081b52378595dd9d6d14ba5a2c8bd8b250a0a163 100644 (file)
@@ -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