From: Michael Fritch <mfritch@suse.com>
Date: Fri, 27 Mar 2020 14:11:19 +0000 (-0600)
Subject: mgr/cephadm: create a "common" config per nfs service
X-Git-Tag: v16.1.0~2642^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=35a4b24a6ff6ca344a6eaa0b14dc8be9ff3173b3;p=ceph.git

mgr/cephadm: create a "common" config per nfs service

instead of a per-daemon RADOS conf object

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 ff748fa57463..067c13137fc1 100644
--- a/src/pybind/mgr/cephadm/nfs.py
+++ b/src/pybind/mgr/cephadm/nfs.py
@@ -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