cephadm: return 'cephadm pull' result as JSON

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

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index e32b4731f210cecea74f0f4545e6aa3cfcbb5a63..c1faf5103c31cc68444f4df41c43b53f6b65454c 100755 (executable)
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1530,7 +1530,10 @@ def command_pull():
         '--format', '{{.Id}}',
         args.image])
     ver = CephContainer(args.image, 'ceph', ['--version']).run()
-    print(out.strip() + ',' + ver)
+    print(json.dumps({
+        'ceph_version': ver,
+        'image_id': out.strip(),
+        }, indent=4, sort_keys=True))
 
 
 ##################################

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index ddf88133d3d2ccc0d4f055eb6a0278c02bd667bd..c6be640aadcbfe0c193c75d570afae883a83b6cf 100644 (file)
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -1528,7 +1528,9 @@ class CephadmOrchestrator(MgrModule, orchestrator.Orchestrator):
             host, None, 'pull', [],
             image=image_name,
             no_fsid=True)
-        (image_id, ceph_version) = out[0].split(',', 1)
+        j = json.loads('\n'.join(out))
+        image_id = j.get('image_id')
+        ceph_version = j.get('ceph_version')
         self.log.debug('image %s -> id %s version %s' %
                        (image_name, image_id, ceph_version))
         return image_id, ceph_version