common: rename 'image' to 'container_image'

This conflicted with the rbd CLI --image argument.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/common/options.cc b/src/common/options.cc
index b0158b0c09ebd55023d207e19d67bef94faab09e..77d04ed6231d5890b447c249c59c6cf5966c7d99 100644 (file)
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -431,7 +431,7 @@ std::vector<Option> get_global_options() {
     .add_tag("network")
     .add_see_also("mon_host"),
 
-    Option("image", Option::TYPE_STR, Option::LEVEL_BASIC)
+    Option("container_image", Option::TYPE_STR, Option::LEVEL_BASIC)
     .set_description("container image (used by ssh orchestrator)")
     .set_flag(Option::FLAG_STARTUP)
     .set_default("ceph/daemon-base"),

diff --git a/src/pybind/mgr/ssh/module.py b/src/pybind/mgr/ssh/module.py
index 96334da55ebad1dac0cb1f4fb3fee2e8614606f6..2d6ef18d67ed17c6b3b79bdbed50c2b5db5d9af2 100644 (file)
--- a/src/pybind/mgr/ssh/module.py
+++ b/src/pybind/mgr/ssh/module.py
@@ -356,7 +356,7 @@ class SSHOrchestrator(MgrModule, orchestrator.Orchestrator):
             ret, image, err = self.mon_command({
                 'prefix': 'config get',
                 'who': entity,
-                'key': 'image',
+                'key': 'container_image',
             })
             image = image.strip()
             self.log.debug('%s container image %s' % (entity, image))