]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
mgr/cephadm: fix upgrades with nvmeof 53862/head
authorAdam King <adking@redhat.com>
Fri, 6 Oct 2023 15:20:57 +0000 (11:20 -0400)
committerAdam King <adking@redhat.com>
Fri, 6 Oct 2023 15:30:21 +0000 (11:30 -0400)
commit43d822dd5a4a5f5a76412c25eff888924a8fb134
treec898b4fd5f414f7667af753a1a0caa23c8ae43d4
parenta44dd1fd7043f4251034558ff7e15a65e91818b7
mgr/cephadm: fix upgrades with nvmeof

Currently, nvmeof was being treated as if it used
a ceph image during upgrades. This would cause logging
of messages like (I've removed the nvmeof daemon id)

log [WRN] :     Upgrade daemon: nvmeof.<id>: Cannot redeploy
nvmeof.<id> with a new image: Supported types are: mgr, mon,
crash, osd, mds, rgw, rbd-mirror, cephfs-mirror, ceph-exporter,
iscsi, nfs

and if you had set a custom image for the
mgr/cephadm/container_image_nvmeof setting, this would
be undone as part of the upgrade process.

Fixes: https://tracker.ceph.com/issues/63127
Signed-off-by: Adam King <adking@redhat.com>
src/pybind/mgr/cephadm/upgrade.py
src/pybind/mgr/cephadm/utils.py