From 198ca7bc679e38e77bfb2c5b257f34bf42112af0 Mon Sep 17 00:00:00 2001 From: Adam King Date: Thu, 6 Jul 2023 11:46:31 -0400 Subject: [PATCH] mgr/cephadm: set default image for reef This needs to be a v18 image instead of the main branch ci build, otherwise those that bootstrap without providing an image name will get main instead of reef Signed-off-by: Adam King --- src/cephadm/cephadm.py | 6 +++--- src/pybind/mgr/cephadm/module.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index 0defc9b0ec3cb..cb7e9f26f7d8f 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -44,8 +44,8 @@ from pathlib import Path FuncT = TypeVar('FuncT', bound=Callable) # Default container images ----------------------------------------------------- -DEFAULT_IMAGE = 'quay.ceph.io/ceph-ci/ceph:main' -DEFAULT_IMAGE_IS_MAIN = True +DEFAULT_IMAGE = 'quay.io/ceph/ceph:v18' +DEFAULT_IMAGE_IS_MAIN = False DEFAULT_IMAGE_RELEASE = 'reef' DEFAULT_PROMETHEUS_IMAGE = 'quay.io/prometheus/prometheus:v2.43.0' DEFAULT_LOKI_IMAGE = 'docker.io/grafana/loki:2.4.0' @@ -63,7 +63,7 @@ DEFAULT_JAEGER_QUERY_IMAGE = 'quay.io/jaegertracing/jaeger-query:1.29' DEFAULT_REGISTRY = 'docker.io' # normalize unqualified digests to this # ------------------------------------------------------------------------------ -LATEST_STABLE_RELEASE = 'quincy' +LATEST_STABLE_RELEASE = 'reef' DATA_DIR = '/var/lib/ceph' LOG_DIR = '/var/log/ceph' LOCK_DIR = '/run/cephadm' diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index 272c83261b0fd..37fe3b4ac58f0 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -103,7 +103,7 @@ os._exit = os_exit_noop # type: ignore # Default container images ----------------------------------------------------- -DEFAULT_IMAGE = 'quay.io/ceph/ceph' +DEFAULT_IMAGE = 'quay.io/ceph/ceph:v18' DEFAULT_PROMETHEUS_IMAGE = 'quay.io/prometheus/prometheus:v2.43.0' DEFAULT_NODE_EXPORTER_IMAGE = 'quay.io/prometheus/node-exporter:v1.5.0' DEFAULT_LOKI_IMAGE = 'docker.io/grafana/loki:2.4.0' -- 2.39.5