]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: infer latest image with a valid tag
authorMichael Fritch <mfritch@suse.com>
Tue, 25 Aug 2020 13:55:08 +0000 (07:55 -0600)
committerSebastian Wagner <sebastian.wagner@suse.com>
Mon, 7 Sep 2020 09:01:03 +0000 (11:01 +0200)
Fixes: https://tracker.ceph.com/issues/47134
Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit d61676f92dc701daeab71bd9d9c35d6cfa9a6434)

src/cephadm/cephadm

index 0a65cb9d3286d1e4adfb3c6b3231ae33343f0561..4795ba4a9a92636590fd67e760b0e25c6e80c93d 100755 (executable)
@@ -1226,12 +1226,12 @@ def get_last_local_ceph_image():
         [container_path, 'images',
          '--filter', 'label=ceph=True',
          '--format', '{{.Repository}} {{.Tag}}'])
-    out_lines = out.splitlines()
-    if len(out_lines) > 0:
-        repository, tag = out_lines[0].split()
-        r = '{}:{}'.format(repository, tag)
-        logger.info('Using recent ceph image %s' % r)
-        return r
+    for line in out.splitlines():
+        if len(line.split()) == 2:
+            repository, tag = line.split()
+            r = '{}:{}'.format(repository, tag)
+            logger.info('Using recent ceph image %s' % r)
+            return r
     return None