]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge pull request #34698 from matthewoliver/cephadm_check_pool_exists
authorSebastian Wagner <sebastian.wagner@suse.com>
Fri, 24 Apr 2020 16:39:10 +0000 (18:39 +0200)
committerGitHub <noreply@github.com>
Fri, 24 Apr 2020 16:39:10 +0000 (18:39 +0200)
cephadm: Check for pool existence for iscsi And NFS

Reviewed-by: Michael Fritch <mfritch@suse.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
1  2 
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/tests/test_cephadm.py

Simple merge
index f13680cab26441c0da6b8ef1c8ffae586d12f530,7be3e950608c8ac5bc43a90abdbe0eee61d186d8..a8bd0ae0f93b413e95ba4c611326f02f1c80d4fe
@@@ -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)