From 160dd6fc944a3cfa556e0cfde704851d58705af5 Mon Sep 17 00:00:00 2001 From: Adam King Date: Mon, 29 Jan 2024 11:23:54 -0500 Subject: [PATCH] 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 (cherry picked from commit 70c00e8ba787d9e9106934cfee0e0afa606ce326) Conflicts: src/cephadm/cephadmlib/daemons/nvmeof.py --- src/cephadm/cephadm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index 99e0ac740a0..5c2e6057c62 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() -- 2.39.5