Merge pull request #34633 from sebastian-philipp/cephadm-total-scheduler

mgr/cephadm: make scheduling make sense

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Michael Fritch <mfritch@suse.com>

diff --cc src/pybind/mgr/cephadm/module.py
Simple merge

diff --cc src/pybind/mgr/cephadm/tests/test_cephadm.py
index f64d8a0ce904d9ae074aa722f2f321c16df4ec6b,3afd98fb724cad1a7f23f2409f74d9cd2dcbd381..e80728c3871e006af3b759bab72281e489df8729
--- 1/src/pybind/mgr/cephadm/tests/test_cephadm.py
--- 2/src/pybind/mgr/cephadm/tests/test_cephadm.py
+++ b/src/pybind/mgr/cephadm/tests/test_cephadm.py
@@@ -434,13 -427,9 +427,13 @@@ class TestCephadm(object)
      @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'):
+         with with_host(cephadm_module, 'test'):
              ps = PlacementSpec(hosts=['test'], count=1)
 -            spec = NFSServiceSpec('name', pool='pool', namespace='namespace', placement=ps)
 +            spec = NFSServiceSpec(
 +                    service_id='name',
 +                    pool='pool',
 +                    namespace='namespace',
 +                    placement=ps)
              c = cephadm_module.add_nfs(spec)
              [out] = wait(cephadm_module, c)
              match_glob(out, "Deployed nfs.name.* on host 'test'")
@@@ -455,14 -444,10 +448,14 @@@
      @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'):
+         with with_host(cephadm_module, 'test'):
              ps = PlacementSpec(hosts=['test'], count=1)
 -            spec = IscsiServiceSpec('name', pool='pool', api_user='user',
 -                                    api_password='password', placement=ps)
 +            spec = IscsiServiceSpec(
 +                    service_id='name',
 +                    pool='pool',
 +                    api_user='user',
 +                    api_password='password',
 +                    placement=ps)
              c = cephadm_module.add_iscsi(spec)
              [out] = wait(cephadm_module, c)
              match_glob(out, "Deployed iscsi.name.* on host 'test'")

diff --cc src/pybind/mgr/orchestrator/_interface.py
Simple merge

diff --cc src/python-common/ceph/deployment/service_spec.py
Simple merge