mgr/cephadm: create empty nfs rados config obj

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

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 65607d06ecbba39eb33fd0d7d7b22cc8136e29f0..829e883d3a07fc3f6a9a727f0a3c832e628e66bc 100644 (file)
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -2763,6 +2763,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
         nfs = NFSGanesha(self, daemon_id, spec.pool, namespace=spec.namespace)
         keyring = nfs.create_keyring()
         cephadm_config = nfs.get_cephadm_config()
+        nfs.create_rados_config_obj()
         return self._create_daemon('nfs', daemon_id, host,
                                    keyring=keyring,
                                    cephadm_config=cephadm_config)

diff --git a/src/pybind/mgr/cephadm/nfs.py b/src/pybind/mgr/cephadm/nfs.py
index 61b4812e0bc5c1fc1df2bcfdc0c1bedf9edb473c..75caf6caec3282f1853f3ad39b1612e29c51b78a 100644 (file)
--- a/src/pybind/mgr/cephadm/nfs.py
+++ b/src/pybind/mgr/cephadm/nfs.py
@@ -46,6 +46,14 @@ class NFSGanesha(object):
         })
         return keyring
 
+    def create_rados_config_obj(self):
+        # type: () -> None
+        obj = self.get_rados_config_name()
+        with self.mgr.rados.open_ioctx(self.pool) as ioctx:
+            if self.namespace:
+                ioctx.set_namespace(self.namespace)
+            ioctx.write_full(obj, ''.encode('utf-8'))
+
     def get_ganesha_conf(self):
         # type: () -> str
         return '''# generated by cephadm

diff --git a/src/pybind/mgr/cephadm/tests/test_cephadm.py b/src/pybind/mgr/cephadm/tests/test_cephadm.py
index eb4d0e2dfdadabf2ac5823ab9ed79dafa1594272..bd6f520267cee788746c0ea92af352c6a452a8fb 100644 (file)
--- a/src/pybind/mgr/cephadm/tests/test_cephadm.py
+++ b/src/pybind/mgr/cephadm/tests/test_cephadm.py
@@ -260,6 +260,7 @@ class TestCephadm(object):
             match_glob(out, "Deployed rbd-mirror.* on host 'test'")
 
     @mock.patch("cephadm.module.CephadmOrchestrator._run_cephadm", _run_cephadm('{}'))
+    @mock.patch("cephadm.module.CephadmOrchestrator.rados", mock.MagicMock())
     def test_nfs(self, cephadm_module):
         with self._with_host(cephadm_module, 'test'):
             ps = PlacementSpec(hosts=['test'], count=1)