cephadm: default to v15 tag for octopus

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 68f0babf9948946db9f7c813816dfc3ea1a69298..64515caa1d871c9296ae9fb85268e9166fa272c4 100755 (executable)
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1,7 +1,6 @@
 #!/usr/bin/python3
 
-#DEFAULT_IMAGE='docker.io/ceph/ceph:v15.2'
-DEFAULT_IMAGE='quay.io/ceph-ci/ceph:octopus'
+DEFAULT_IMAGE='docker.io/ceph/ceph:v15'
 DATA_DIR='/var/lib/ceph'
 LOG_DIR='/var/log/ceph'
 LOCK_DIR='/run/cephadm'

diff --git a/src/common/options.cc b/src/common/options.cc
index 6b4251ba127e3988e6768e5bef82f855ee5797c4..1354b133faed63837662b52d2e7070f3bdd7d051 100644 (file)
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -439,8 +439,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("quay.io/ceph-ci/ceph:octopus"),
-    //.set_default("docker.io/ceph/ceph:v15.2"),
+    .set_default("docker.io/ceph/ceph:v15"),
 
     Option("no_config_file", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
     .set_default(false)