]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: create a "common" config per nfs service
authorMichael Fritch <mfritch@suse.com>
Fri, 27 Mar 2020 14:11:19 +0000 (08:11 -0600)
committerSebastian Wagner <sebastian.wagner@suse.com>
Tue, 14 Apr 2020 14:50:50 +0000 (16:50 +0200)
instead of a per-daemon RADOS conf object

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

src/pybind/mgr/cephadm/nfs.py

index 0f8acc0362c66fc842691a4ddeea63d1ed1d9c9a..500f38ba8c989052dbde38193c347323b8ad4bb4 100644 (file)
@@ -28,7 +28,7 @@ class NFSGanesha(object):
 
     def get_rados_config_name(self):
         # type: () -> str
-        return 'conf-' + self.get_rados_user()
+        return 'conf-' + self.spec.service_name()
 
     def get_rados_config_url(self):
         # type: () -> str