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: wip-pdonnell-testing-20200918.022351~1592^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=659a6936e277a7205742e02a489d8a56ae1bd9ed;p=ceph-ci.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>
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 7e89a365500..12fc00342de 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -1519,7 +1519,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',