From: Sebastian Wagner Date: Fri, 24 Apr 2020 16:39:10 +0000 (+0200) Subject: Merge pull request #34698 from matthewoliver/cephadm_check_pool_exists X-Git-Tag: v16.1.0~2508 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cc5b26394188b346edea56f0e7a1a7cba375bfe2;p=ceph.git Merge pull request #34698 from matthewoliver/cephadm_check_pool_exists cephadm: Check for pool existence for iscsi And NFS Reviewed-by: Michael Fritch Reviewed-by: Sebastian Wagner --- cc5b26394188b346edea56f0e7a1a7cba375bfe2 diff --cc src/pybind/mgr/cephadm/tests/test_cephadm.py index f13680cab264,7be3e950608c..a8bd0ae0f93b --- a/src/pybind/mgr/cephadm/tests/test_cephadm.py +++ b/src/pybind/mgr/cephadm/tests/test_cephadm.py @@@ -430,14 -428,8 +430,15 @@@ class TestCephadm(object) [out] = wait(cephadm_module, c) match_glob(out, "Deployed nfs.name.* on host 'test'") + assert_rm_daemon(cephadm_module, 'nfs.name.test', 'test') + + # Hack. We never created the service, but we now need to remove it. + # this is in contrast to the other services, which don't create this service + # automatically. + assert_rm_service(cephadm_module, 'nfs.name') + @mock.patch("cephadm.module.CephadmOrchestrator._run_cephadm", _run_cephadm('{}')) + @mock.patch("cephadm.module.CephadmOrchestrator.rados", mock.MagicMock()) def test_iscsi(self, cephadm_module): with self._with_host(cephadm_module, 'test'): ps = PlacementSpec(hosts=['test'], count=1)