]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: fix get_version for nvmeof 56099/head
authorAdam King <adking@redhat.com>
Mon, 29 Jan 2024 16:23:54 +0000 (11:23 -0500)
committerAdam King <adking@redhat.com>
Sun, 10 Mar 2024 20:19:09 +0000 (16:19 -0400)
This needed to be using the container id it was
passed, instead of ctx.image which is likely to
be `None` when this is run.

Fixes: https://tracker.ceph.com/issues/64229
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 70c00e8ba787d9e9106934cfee0e0afa606ce326)

Conflicts:
src/cephadm/cephadmlib/daemons/nvmeof.py

src/cephadm/cephadm.py

index 99e0ac740a0eb76512fb018b98fbcbd9cd4f08d6..5c2e6057c626941a533efbdf4b78594b9395a73a 100755 (executable)
@@ -1220,7 +1220,7 @@ class CephNvmeof(object):
         out, err, ret = call(ctx,
                              [ctx.container_engine.path, 'inspect',
                               '--format', '{{index .Config.Labels "io.ceph.version"}}',
-                              ctx.image])
+                              container_id])
         version = None
         if ret == 0:
             version = out.strip()