Merge pull request #35097 from matthewoliver/cephadm_iscsi_api_user_password

cephadm: Make ceph-iscsi api user and password mandatory

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

diff --cc src/pybind/mgr/cephadm/tests/test_cephadm.py
index cb9453f0367082c14e69007051cbcd6c088c2150,a2358ae2da28709073d9b378e7c7e156b4786042..30cc55984d74121e817382128f9e072235b64cde
--- 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
@@@ -482,29 -472,10 +483,30 @@@ class TestCephadm(object)
              (ServiceSpec('alertmanager'), CephadmOrchestrator.apply_alertmanager),
              (ServiceSpec('rbd-mirror'), CephadmOrchestrator.apply_rbd_mirror),
              (ServiceSpec('mds', service_id='fsname'), CephadmOrchestrator.apply_mds),
 +            (ServiceSpec(
 +                'mds', service_id='fsname',
 +                placement=PlacementSpec(
 +                    hosts=[HostPlacementSpec(
 +                        hostname='test',
 +                        name='fsname',
 +                        network=''
 +                    )]
 +                )
 +            ), CephadmOrchestrator.apply_mds),
              (RGWSpec(rgw_realm='realm', rgw_zone='zone'), CephadmOrchestrator.apply_rgw),
 +            (RGWSpec(
 +                rgw_realm='realm', rgw_zone='zone',
 +                placement=PlacementSpec(
 +                    hosts=[HostPlacementSpec(
 +                        hostname='test',
 +                        name='realm.zone.a',
 +                        network=''
 +                    )]
 +                )
 +            ), CephadmOrchestrator.apply_rgw),
              (NFSServiceSpec('name', pool='pool', namespace='namespace'), CephadmOrchestrator.apply_nfs),
-             (IscsiServiceSpec('name', pool='pool'), CephadmOrchestrator.apply_iscsi),
+             (IscsiServiceSpec('name', pool='pool', api_user='user', api_password='password'),
+              CephadmOrchestrator.apply_iscsi),
          ]
      )
      @mock.patch("cephadm.module.CephadmOrchestrator._run_cephadm", _run_cephadm('{}'))

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