From: Adam King <adking@redhat.com>
Date: Tue, 10 Oct 2023 16:28:54 +0000 (-0400)
Subject: mgr/cephadm: fix default image base in reef
X-Git-Tag: v18.2.1~114^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=377ec62c5fdeffa61c03131caa11434230ea5fcf;p=ceph.git

mgr/cephadm: fix default image base in reef

The image base is not meant to have a tag attached
to it. IT is just meant to be the base to be added
to with other tags as part of things like providing
--ceph-version to the upgrade command

Fixes: https://tracker.ceph.com/issues/63150

Signed-off-by: Adam King <adking@redhat.com>
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 6fc959c0013e..7b97ce74a947 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -104,7 +104,7 @@ os._exit = os_exit_noop   # type: ignore
 
 
 # Default container images -----------------------------------------------------
-DEFAULT_IMAGE = 'quay.io/ceph/ceph:v18'
+DEFAULT_IMAGE = 'quay.io/ceph/ceph'  # DO NOT ADD TAG TO THIS
 DEFAULT_PROMETHEUS_IMAGE = 'quay.io/prometheus/prometheus:v2.43.0'
 DEFAULT_NODE_EXPORTER_IMAGE = 'quay.io/prometheus/node-exporter:v1.5.0'
 DEFAULT_NVMEOF_IMAGE = 'quay.io/ceph/nvmeof:0.0.2'