From: Kefu Chai <kchai@redhat.com>
Date: Wed, 27 May 2020 13:54:42 +0000 (+0800)
Subject: Merge pull request #35097 from matthewoliver/cephadm_iscsi_api_user_password
X-Git-Tag: v16.1.0~2229
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3b333f010d60857f5f8b436ea74c9d86968ad5b3;p=ceph.git

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>
---

3b333f010d60857f5f8b436ea74c9d86968ad5b3
diff --cc src/pybind/mgr/cephadm/tests/test_cephadm.py
index cb9453f03670,a2358ae2da28..30cc55984d74
--- a/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('{}'))