]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: allow config for an iscsi `container_image`
authorMichael Fritch <mfritch@suse.com>
Wed, 22 Apr 2020 19:28:43 +0000 (13:28 -0600)
committerSebastian Wagner <sebastian.wagner@suse.com>
Mon, 4 May 2020 16:03:02 +0000 (18:03 +0200)
ceph config set client.iscsi container_image <container_image>

Fixes: https://tracker.ceph.com/issues/45162
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 4e73255ffa4161e4ceaf54cf9f8c569b2a8ecfc3)

src/pybind/mgr/cephadm/module.py

index 537c4d4102fa6ddb76e63512202dd25db0c8fd7a..16f9f524969501b39ae86b9f24a8d276875e37a1 100644 (file)
@@ -1577,7 +1577,8 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
             if not image:
                 daemon_type = entity.split('.', 1)[0] # type: ignore
                 if daemon_type in CEPH_TYPES or \
-                        daemon_type == 'nfs':
+                        daemon_type == 'nfs' or \
+                        daemon_type == 'iscsi':
                     # get container image
                     ret, image, err = self.mon_command({
                         'prefix': 'config get',