From: Michael Fritch <mfritch@suse.com>
Date: Thu, 26 Mar 2020 17:28:33 +0000 (-0600)
Subject: mgr/cephadm: allow config for an nfs `container_image`
X-Git-Tag: v15.2.2~76^2~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8b65d8ec26b30e8e0539c61d482c2426928e062f;p=ceph.git

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

ceph config set <entity> container_image <container_image>

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 659a6936e277a7205742e02a489d8a56ae1bd9ed)
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 488f2893dc7..7d8507fe104 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -1577,7 +1577,8 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
             assert image or entity
             if not image:
                 daemon_type = entity.split('.', 1)[0] # type: ignore
-                if daemon_type in CEPH_TYPES:
+                if daemon_type in CEPH_TYPES or \
+                        daemon_type == 'nfs':
                     # get container image
                     ret, image, err = self.mon_command({
                         'prefix': 'config get',