From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Wed, 3 Feb 2021 11:34:49 +0000 (+0100)
Subject: cephadm: use ceph/daemon-base:latest-pacific-devel image
X-Git-Tag: v16.2.0~216^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F39252%2Fhead;p=ceph.git

cephadm: use ceph/daemon-base:latest-pacific-devel image

Fixes: https://tracker.ceph.com/issues/49041
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 40da060324a4..adbf06627946 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 
-DEFAULT_IMAGE = 'docker.io/ceph/daemon-base:latest-master-devel'
-DEFAULT_IMAGE_IS_MASTER = True
+DEFAULT_IMAGE = 'docker.io/ceph/daemon-base:latest-pacific-devel'
+DEFAULT_IMAGE_IS_MASTER = False
 LATEST_STABLE_RELEASE = 'pacific'
 DATA_DIR = '/var/lib/ceph'
 LOG_DIR = '/var/log/ceph'
@@ -3812,7 +3812,7 @@ def command_bootstrap(ctx):
     logger.info('Please consider enabling telemetry to help improve Ceph:\n\n'
                 '\tceph telemetry on\n\n'
                 'For more information see:\n\n'
-                '\thttps://docs.ceph.com/docs/master/mgr/telemetry/\n')
+                '\thttps://docs.ceph.com/docs/pacific/mgr/telemetry/\n')
     logger.info('Bootstrap complete.')
     return 0
 
diff --git a/src/common/options.cc b/src/common/options.cc
index 8e15babf9e3c..774f263a1e4a 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -456,7 +456,7 @@ std::vector<Option> get_global_options() {
     Option("container_image", Option::TYPE_STR, Option::LEVEL_BASIC)
     .set_description("container image (used by cephadm orchestrator)")
     .set_flag(Option::FLAG_STARTUP)
-    .set_default("docker.io/ceph/daemon-base:latest-master-devel"),
+    .set_default("docker.io/ceph/daemon-base:latest-pacific-devel"),
 
     Option("no_config_file", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
     .set_default(false)