Merge pull request #34658 from matthewoliver/cephadm_iscsi_ssl

cephadm: Make ceph-iscsi SSL aware

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>

diff --cc src/pybind/mgr/cephadm/module.py
index c23aa2703c4f102fce67187f5c5043e07a93cee1,8265c368f7d287744109d2a4756db97fc81ff1ad..81d4cb3bd3a4f8e4d6ab1b293a0e96ecef861f4b
--- 1/src/pybind/mgr/cephadm/module.py
--- 2/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@@ -2860,10 -2865,12 +2860,12 @@@ class CephadmOrchestrator(orchestrator.
          self.spec_store.save(spec)
  
      def _create_iscsi(self, igw_id, host, spec):
 -        ret, keyring, err = self.mon_command({
 +        ret, keyring, err = self.check_mon_command({
              'prefix': 'auth get-or-create',
              'entity': utils.name_to_config_section('iscsi') + '.' + igw_id,
-             'caps': ['mon', 'allow rw',
+             'caps': ['mon', 'profile rbd, '
+                             'allow command "osd blacklist", '
+                             'allow command "config-key get" with "key" prefix "iscsi/"',
                       'osd', f'allow rwx pool={spec.pool}'],
          })
  

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