From fdf90bf530edbb9608fb8a5d273f7ce38147f534 Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Tue, 17 Mar 2020 15:14:55 -0600 Subject: [PATCH] mgr/cephadm: combine `get_daemon_name` and `get_rados_user` funcs Signed-off-by: Michael Fritch --- src/pybind/mgr/cephadm/nfs.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) 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 -- 2.47.3