]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: allow config for an nfs `container_image`
authorMichael Fritch <mfritch@suse.com>
Thu, 26 Mar 2020 17:28:33 +0000 (11:28 -0600)
committerSebastian Wagner <sebastian.wagner@suse.com>
Tue, 14 Apr 2020 14:50:50 +0000 (16:50 +0200)
ceph config set <entity> container_image <container_image>

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

src/pybind/mgr/cephadm/module.py

index 488f2893dc7e6bd54f115725d0ac3ee50cec75f2..7d8507fe104d5ffc1a22a001c6e9e2e51f28819a 100644 (file)
@@ -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',