nvmeof: Change the NVMEOF image version to 1.6

Fixes: https://tracker.ceph.com/issues/75097
Signed-off-by: Gil Bregman <gbregman@il.ibm.com>
(cherry picked from commit 02587347b0a4e7ae1d7f5d738bd33808e2d56bc9)
Signed-off-by: Gil Bregman <gbregman@il.ibm.com>
Conflicts:

    src/python-common/ceph/cephadm/images.py

We forgot to set version 1.6 in time. By the time we got to it, the main
branch has already moved up to use version 1.7 which contains features
we don't have in tentacle. We want version 1.6 for tentacle so we had to
change the commit here to 1.6.

Signed-off-by: Gil Bregman <gbregman@il.ibm.com>

diff --git a/src/python-common/ceph/cephadm/images.py b/src/python-common/ceph/cephadm/images.py
index b74a4217d234f8dd4211a63f8d217e2ab5dc5ffa..b7063cc5c607cd5b85f0211646357ea2d21b45d0 100644 (file)
--- a/src/python-common/ceph/cephadm/images.py
+++ b/src/python-common/ceph/cephadm/images.py
@@ -32,7 +32,7 @@ class DefaultImages(Enum):
     GRAFANA = _create_image('quay.io/ceph/grafana:12.3.1', 'grafana')
     HAPROXY = _create_image('quay.io/ceph/haproxy:2.3', 'haproxy')
     KEEPALIVED = _create_image('quay.io/ceph/keepalived:2.2.4', 'keepalived')
-    NVMEOF = _create_image('quay.io/ceph/nvmeof:1.5', 'nvmeof')
+    NVMEOF = _create_image('quay.io/ceph/nvmeof:1.6', 'nvmeof')
     SNMP_GATEWAY = _create_image('docker.io/maxwo/snmp-notifier:v1.2.1', 'snmp_gateway')
     ELASTICSEARCH = _create_image('quay.io/omrizeneva/elasticsearch:6.8.23', 'elasticsearch')
     JAEGER_COLLECTOR = _create_image('quay.io/jaegertracing/jaeger-collector:1.29',