From: Michael Fritch <mfritch@suse.com>
Date: Wed, 22 Apr 2020 19:28:43 +0000 (-0600)
Subject: mgr/cephadm: allow config for an iscsi `container_image`
X-Git-Tag: v15.2.4~13^2~3^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c3d53fdb7d24254229660fc5b470baa1b1ed3a31;p=ceph.git

mgr/cephadm: allow config for an iscsi `container_image`

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

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 537c4d4102fa..16f9f5249695 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -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',