From: Adam King <adking@redhat.com>
Date: Mon, 29 Jan 2024 16:23:54 +0000 (-0500)
Subject: cephadm: fix get_version for nvmeof
X-Git-Tag: v18.2.4~188^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F56099%2Fhead;p=ceph.git

cephadm: fix get_version for nvmeof

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
---

diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py
index 99e0ac740a0e..5c2e6057c626 100755
--- a/src/cephadm/cephadm.py
+++ b/src/cephadm/cephadm.py
@@ -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()