From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Tue, 5 May 2020 08:37:07 +0000 (+0200)
Subject: Merge pull request #34658 from matthewoliver/cephadm_iscsi_ssl
X-Git-Tag: v16.1.0~2423
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=16c330cba9af19a05523060e448553dbc31941cf;p=ceph.git

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

16c330cba9af19a05523060e448553dbc31941cf
diff --cc src/pybind/mgr/cephadm/module.py
index c23aa2703c4,8265c368f7d..81d4cb3bd3a
--- a/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}'],
          })