From: Sage Weil <sage@redhat.com>
Date: Wed, 9 Oct 2019 02:59:07 +0000 (-0500)
Subject: common: rename 'image' to 'container_image'
X-Git-Tag: v15.1.0~1297^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=05fdb7203755bef16f678e76a952d2ec54688200;p=ceph-ci.git

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 b0158b0c09e..77d04ed6231 100644
--- 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 96334da55eb..2d6ef18d67e 100644
--- 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))