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: v19.3.0~30^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=70c00e8ba787d9e9106934cfee0e0afa606ce326;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>
---

diff --git a/src/cephadm/cephadmlib/daemons/nvmeof.py b/src/cephadm/cephadmlib/daemons/nvmeof.py
index 39488406bc8e..673761e8e6eb 100644
--- a/src/cephadm/cephadmlib/daemons/nvmeof.py
+++ b/src/cephadm/cephadmlib/daemons/nvmeof.py
@@ -101,7 +101,7 @@ class CephNvmeof(ContainerDaemonForm):
                 'inspect',
                 '--format',
                 '{{index .Config.Labels "io.ceph.version"}}',
-                ctx.image,
+                container_id,
             ],
         )
         version = None