mgr/cephadm: ensure nfs uses the correct entity

mon entity needs to start with `client.`

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

diff --git a/src/pybind/mgr/cephadm/__init__.py b/src/pybind/mgr/cephadm/__init__.py
index f390f18c16aaacde7e142cd485dacdc48135f23c..4d7a2fcb659dae2b5fedb316b33ffdf2dfded698 100644 (file)
--- a/src/pybind/mgr/cephadm/__init__.py
+++ b/src/pybind/mgr/cephadm/__init__.py
@@ -3,4 +3,4 @@ import os
 if 'UNITTEST' in os.environ:
     import tests
 
-from .module import CephadmOrchestrator
+from .module import CephadmOrchestrator, name_to_config_section

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 333cd53a79dc199bbc11f66efd7584d1fdbc5152..1f1fd4527d4b67e28af174d77efe6b67898c78ff 100644 (file)
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -102,7 +102,7 @@ def name_to_config_section(name):
     Map from daemon names to ceph entity names (as seen in config)
     """
     daemon_type = name.split('.', 1)[0]
-    if daemon_type in ['rgw', 'rbd-mirror', 'crash']:
+    if daemon_type in ['rgw', 'rbd-mirror', 'nfs', 'crash']:
         return 'client.' + name
     elif daemon_type in ['mon', 'osd', 'mds', 'mgr', 'client']:
         return name

diff --git a/src/pybind/mgr/cephadm/nfs.py b/src/pybind/mgr/cephadm/nfs.py
index 1ba0d8a57940e40c2cc98b79d8037fb5160aa5a2..20a25ba143f39f797e6dc376a08d444fa83e5ee8 100644 (file)
--- a/src/pybind/mgr/cephadm/nfs.py
+++ b/src/pybind/mgr/cephadm/nfs.py
@@ -45,7 +45,7 @@ class NFSGanesha(object):
 
     def create_keyring(self):
         # type: () -> str
-        entity = 'client.' + self.get_rados_user() 
+        entity = cephadm.name_to_config_section(self.get_rados_user())
 
         osd_caps='allow rw pool=%s' % (self.pool)
         if self.namespace: